Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Apply stashed changes after successful checkout (stash will be popped automatically) #40

Closed
jbialobr opened this issue Jul 3, 2013 · 6 comments
Labels
Milestone

Comments

@jbialobr
Copy link
Member

jbialobr commented Jul 3, 2013

New setting Advanced -> Confirmations -> Apply stashed changes after successful checkout (stash will be popped automatically).
It is similar to Apply stashed changes after successful pull. When you checkout branch and choose to stash local changes, they will be automatically poped after successful checkout.

@rthorp
Copy link

rthorp commented Jul 3, 2013

This looks like a minor change - I am happy to do it. I assume I branch off from release/2.47 and do the PR to merge back into there? Also v2.44 has no Stash checkbox on the Checkout dialog - you have added this Stash checkbox in 2.47?

@jbialobr
Copy link
Member Author

jbialobr commented Jul 4, 2013

I think PR is not necessary, you can do it directly on 2.47 - but it is your choice.
To see stash option you have to have uncommited changes and then checkout other branch.
hdhcaihc

@rthorp
Copy link

rthorp commented Jul 4, 2013

Yeah, I know PR is not necessary, but in my job we have audits every year and we have to demonstrate we follow the correct processes - if you deviate, you have to explain why. I figure if the general process for GitHub work is raise an issue, somebody fixes and does a PR, then the maintainer merges that PR, I should follow the same process. I would prefer to do it that way if it doesn't cause any complications.

@jbialobr
Copy link
Member Author

jbialobr commented Jul 4, 2013

I should follow the same process. I would prefer to do it that way if it doesn't cause any complications.

Fine by me. Now I see you understand how it works and it is your conscious choice.

rthorp added a commit that referenced this issue Jul 4, 2013
Added new setting "Apply stashed changes after successful checkout" to Advanced->Confirmations in the Settings dialog.

Fixes Issue #40
@rthorp
Copy link

rthorp commented Jul 4, 2013

Updated release/2.47 and also pushed to master. Do you close this issue now or leave open till 2.47 official release?

@jbialobr
Copy link
Member Author

jbialobr commented Jul 4, 2013

I close it as it is merged to 2.47. Thanks.

@jbialobr jbialobr closed this as completed Jul 4, 2013
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

No branches or pull requests

2 participants