End up on wrong branch after Update

[gsaslis]

1. I was on my develop branch with 3 files with uncommitted changes.
2. I pressed alt+t to update.
3. I ended up on a feature/docker branch with lots of uncommitted files and a completely different file structure.
4. on attempting to checkout my develop branch, i get a warning that some files (one that exists on both branches (with different content) and the 3 i had with uncommitted changes) will get overwritten.

I had to delete all 4 files so that i could switch back to my develop branch.

hope that helps trace it...

[JChrist]

Thanks a lot for the report!
I'm really sorry to hear that you had issues with the plugin.
Assuming that you haven't enabled the non-fast-forward merges (from the GitExtender settings), then GitExtender would have issued a git merge --ff-only, that would have failed (and shown an error message to you). From that point on, there are the following options:

• Abort the merge with git merge --abort in your terminal, switch to your original branch and apply the stash with git stash pop
• Manually perform the merge on the branch you are on. Then again switch to your original branch and apply the stash
• Enable the option to attempt non-fast-forward merges and abort if they fail due to conflicts. For your case, this option would have performed an abort on your behalf and leave you back to your branch with the stash applied (popped), with an error message for the branch that failed to be updated. This option is planned to become enabled by default in a future version.

[gsaslis]

You're right, i hadn't enabled that setting.

I enabled it and thought i'd give it another go, to verify this for you.

1. on my develop branch, changed 1 of the previous 3 files (should be enough anyway)
2. pressed alt+t
3. still ended up on feature/docker branch. based on your previous message i was expecting to still end up on develop, with the error message you said about the feature/docker branch failing. Instead I got the following error message: "Local branch: develop Git repo: Checkout Error: The following untracked working tree files would be overwritten by checkout:"
4. tried

git merge --abort                             
fatal: There is no merge to abort (MERGE_HEAD missing).

... i'm guessing something is not going as planned?

[JChrist]

Ok, it starts making sense now. The problem is not during merge, but during checkout. Can you confirm that if you try checking out your feature branch and then switching back to develop results in the exact same issue?

[JChrist]

This seems quite promising as a solution for this issue.
I will be taking a look into it in the near future, or (to be honest) as time allows