merge commit not correctly handled
Reported by Benoit Cerrina | June 20th, 2009 @ 04:57 PM
Hello, I found that when there is a merge conflict gitx commit
is not correctly working.
Specifically do the following:
1) create an empty repository
2) create a file in it (say test.txt)
3) commit
4) create branch experimental
5) add a line in test.txt in experimental branch and commit
6) switch to master, add a line in test.txt conflicting with the
one added in 5 and commit
7) merge master and experimental, conflict happens
8) git mergetool to resolve the conflict, select one of the changes
(doesn't matter which)
9) in gitx commit the changes
10) check the history in gitx, the 2 branches should merge, they
don't
you can do the same scenario but in step 9 use git gui to commit and you will find the correct behavior
Comments and changes to this ticket
-
Pieter de Bie June 20th, 2009 @ 09:50 PM
- State changed from “new” to “invalid”
Hey,
Thanks for reporting this. However, this has already been reported in bug #140. I'll try to put a fix in for the next release where you just can't commit merge commits.
-
Benoit Cerrina June 20th, 2009 @ 09:54 PM
strange, I had searched for tickets containing merge in order to avoid duplicate but didn't find this one. My bad
Please Sign in or create a free account to add a new ticket.
With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile »
GitX is the nice-looking gitk clone for OS X