Community
Participate
Working Groups
Build Identifier: 1. There should be a option in EGit configuration: "Check uncommited files on branch switch/checkout" 2. If during branch switch EGit find uncomitted changes(even untracked ones), it should ask user for decision: --a. Abort switch (don't do anything) --b. stash changes and continue switch --c. commit changes and continue switch --d. leave changes uncommited and take them to branch XXX. Stash is a future request, when it will be implemented in EGit. Reproducible: Always Steps to Reproduce: 1. Make some changes (on local branch), do not commit 2. Checkout another branch (local, based on same remote like in step 1) 3. Make some changes 4. Commit. It is possible to commit changes from step 1 together with those from step 3
+1. Currently the dialog is not helpful and makes switching branches more heavyweight than it should be.
thats actually a git feature according to cgit man pages: if you accidentally worked on the wrong branch, and realize before committing, you can switch, and git will take the changes along. however i agree that this behaviour should be configurable.
+1 Especially a stash button on that dialog would be really cool.
this button already exists on master :)
EGit 2.0.0.201204130249 I just tried the "Reset ..." option, selected "hard" and it seems it *only* performed the reset, but not the checkout. I didn't try to reproduce though. May we expect the final behavior to do the selected [reset/commit/stash] and then *continue* with the checkout?
yes, it should continue after the selected action to remove uncommitted changes has finished.
(In reply to comment #6) > yes, it should continue after the selected action to remove uncommitted changes > has finished. Cool, looking forward to the fix :)
*** Bug 385245 has been marked as a duplicate of this bug. ***
Fix proposed: https://git.eclipse.org/r/#/c/7321/
merged as ed119527f1d30405bdf8d891206a49c0f4933f35
