You’re the branches-and-merges-are-easy version-control system around here.Īll right, so I will just git pull again, and this time the merge will work OK. Well, duh! I was telling you to merge, you stupid git. So, OK, no problem, I already fixed the conflict, so now I’ll just git merge again to get it to make its world consistent, right? Nope: “fatal: You have not concluded your merge. “fatal: cannot do a partial commit during a merge.” So I edit the file, fix the trivial conflict, and git commit filename. ![]() So far, so good - someone else edited the same region of the same file as I did (among their other edits): of course its a conflict, there’s nothing git could do differently here but notify me and ask me to fix it. Automatic merge failed fix conflicts and then commit the result.”
0 Comments
Leave a Reply. |