As indicated in the description. I would not even ask to resolve merge conflicts when they were automatically resolved.
My scenario is that I add a line containing a fixed text string to a text file on one branch, make some other commits in the same branch, and then on the other branch cherry - select the change that adds the fixed text, then merge with another branch.
I do this as a test, because in my day to day I often get conflicts, but when I use my merge tool, he says there are no conflicts, so I just close it and fix it manually.
The problem is that I am invited to take extra steps when in fact git is already correctly merged into the changes. (I even checked the file manually to make sure that it is not my merge tool that does the resolution, and indeed the conflict is already resolved in the file).
I tried using the "-commit" option to merge git, but it has no effect.
It seems that git was not able to automatically change the changes according to the message, but in fact it actually merged the files correctly.
Is there a way to simply merge these conflicts and continue without manual intervention?
I am using git version 1.7.10.msysgit.1
Coder source
share