oxygen-git-client-addon icon indicating copy to clipboard operation
oxygen-git-client-addon copied to clipboard

Feature request: Ask user to discard XPR changes before checkout

Open stefan-jung opened this issue 3 years ago • 4 comments

Hi, I frequently switch branches, e.g. from main to a feature branch. What happens to me quite often is, that a change in an XPR file is blocking the checkout. It happens in at least 75% of all cases. Then I usually need to switch the view and discard the XPR change. Unfortunately Git does not have something like a "pre-checkout" hook. So I cannot automate this. It would be nice if the Git addon would ask me, if I would like to discard XPR changes when this is interfering the checkout in some way.

stefan-jung avatar Jan 18 '22 09:01 stefan-jung

Hi, In this scenario we currently present this dialog: image

Sometimes moving the changes fails with: image For this cases it would be good to have an additional option "Discard changes" in the dialog.

Does this sound O.K.?

AlexJitianu avatar Jan 21 '22 07:01 AlexJitianu

As a side note in the "Preferences->Project Level Settings" page maybe you can uncheck certain checkboxes to make the project.xpr less volatile to change.

raducoravu avatar Jan 21 '22 07:01 raducoravu

@AlexJitianu, yes. Currently I stash everything and delete my stashes every few days. :smile:

stefan-jung avatar Mar 01 '22 05:03 stefan-jung

Note: internal issue ID is EXM-49768.

sorincarbunaru avatar Mar 07 '23 09:03 sorincarbunaru