Fw: Merge conflict

2014-01-05 Thread Phil Holmes
- Original Message - From: Phil Holmes em...@philholmes.net To: Devel lilypond-devel@gnu.org 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

Re: Fw: Merge conflict

2014-01-05 Thread David Kastrup
Phil Holmes m...@philholmes.net writes: - Original Message - From: Phil Holmes em...@philholmes.net To: Devel lilypond-devel@gnu.org 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

Re: Fw: Merge conflict

2014-01-05 Thread Phil Holmes
- Original Message - From: David Kastrup d...@gnu.org To: Phil Holmes m...@philholmes.net Cc: Devel lilypond-devel@gnu.org Sent: Sunday, January 05, 2014 2:46 PM Subject: Re: Fw: Merge conflict Phil Holmes m...@philholmes.net writes: - Original Message - From: Phil Holmes em