git actually sucks at some merges 101 :P. I'm going to have to play with my test repository further because eventually I should be able to get git-write-tree failures making any kind of 'merge' impossible. git://github.com/xenoterracide/git-test-case.git clone that. checkout branch 1. then git merge master to see my end failure. steps to create add a file in a branch with a line (or more). create a new branch based on this branch and check it out. in the new branch mv the file into a directory with the same name as the file was. add -u and add the file so git sees the rename. checkout the original branch add some lines. checkout the new branch merge. the merge will go fine. remove a line from the new branches file. checkout master. add another line to that file. checkout new branch and attempt to merge. you should now see the point that may test case is at. -- Caleb Cushing http://xenoterracide.blogspot.com -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
