It is relatively easy and intuitive to undo changes in the working copy in gmaster using the x button next to the change. Expanding on that feature, I suggest adding such a button for recognized blocks of code, such as: types, classes, methods, fields.