----- Original Message -----
From: "Phil Holmes" <[email protected]>
To: "Devel" <[email protected]>
Sent: Sunday, January 05, 2014 12:19 PM
Subject: Merge conflict
I'm trying to create a 2.19.0 build and running into merge conflicts.
Following the CG, I've done:
git fetch
git checkout release/unstable
git merge origin/master
This creates a number of merge conflicts: changes.tely is an obvious one.
Is there something that can be simply done to sort the conflicts out?
--
Phil Holmes
Forwarding from a different email address.
--
Phil Holmes
_______________________________________________
lilypond-devel mailing list
[email protected]
https://lists.gnu.org/mailman/listinfo/lilypond-devel
