On Tue, Mar 24, 2009 at 05:15:32PM +0100, John Mandereau wrote: > Hi James, > James E. Bailey a écrit : >> Leave it to me to take something easy and make it difficult. So, I had >> a conflict. > Please take half an hour to read sections "HOW CONFLICTS ARE PRESENTED" > and "HOW TO RESOLVE CONFLICTS" in "git merge" documentation (the man > page if you're on Linux, or in HTML on Git web site anyway), as > suggested in the CG. I know you've already been making significant > effort to get used to Git and Texinfo, but that's really worth it: after > this, you'll never be scared by conflicts any more.
Ick. Do we really need to ask casual contributors to spend 30 minutes reading how to use git? Isn't there any faster way to give the instructions? Like - copy the conflicted file to a backup name - delete the file - do "git reset --hard" - do "git pull origin" - compare the conflicted file and the new version, and make whatever changes to the new version that you want. ? Cheers, - Graham _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org http://lists.gnu.org/mailman/listinfo/lilypond-devel
