Resolving conflicts can result in nothing to commit and branch merge not concluded
By kev.cla... on June 22, 2010 16:58 (imported from Google Code)
What steps will reproduce the problem?
- In a test repo, create a single line modification to file that you know will conflict with an existing commit in a remote repo. Commit locally; then pull from the remote repo.
- File will be marked as conflict as expected. Either use 3way merge, or simply edit the file to remove the conflict markers, and leave your LOCAL repo changes, ie accept your local commit over the remotes version.
- Right click on the conflicted file TortoiseGit -> Resolved... This now marks the file as clean, no changes, where a modified file to commit was expected. A further pull cannot be performed, as you get 'You have not concluded your merge (MERGE_HEAD exists)', and you have to perform: 'git reset HEAD --hard' to reset your merge and start over.
What is the expected output? What do you see instead?
Resolving the file by only including your original LOCAL commit (ie rejecting the remote merge) should still result in a modified file so it can be committed locally as the merge result, then pushed. Doing this by the command line you would normally do as steps 1 and 2 above, but then stage the file and commit as normal. I don't know what TortoiseGit is doing to the repo with the 'Resolved...' action in context menu?
What version of the product are you using? On what operating system?
msysGit 184.108.40.206 32bit
TortoiseGit 1.5.2 32bit
To upload designs, you'll need to enable LFS and have an admin enable hashed storage. More information