Hello, > So is there a doc or something that describes how to resolve merge > conflicts? > Presumably I look at .merge_file_*, and make sure that all necessary > changes make it into the copy of the file in the working directory... > then what? How to continue the merge? I attached a perlscript which tries to make it easy for the user. Maybe you can 'pull out the' logic and put it in a shell script or so. git pull ... Conflicts ... run git resolve git resolve ... Thomas - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
This archive was generated by hypermail 2.1.8 : 2005-05-27 19:53:16 EST