[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
git merge mess to sort out
From: |
Graham Percival |
Subject: |
git merge mess to sort out |
Date: |
Fri, 27 May 2011 13:16:52 +0100 |
Hi guys,
I'd like to be able to do
git checkout master
git merge stable/2.14
as implied by step 1 of "post release" on:
http://lilypond.org/doc/v2.13/Documentation/contributor/minor-release-checklist
This step is useful to get the news announcement of the release; I
don't expect to see anything else in these merges.
Unfortunately, at the moment this produces a bunch of merge conflicts.
Probably nothing serious, but it's an annoyance. Since it's been so
long since the last release, I just went ahead and re-created the news
announcements (which of course creates another merge conflict).
Does anybody feel like playing with git? I suppose this could be a
useful exercise in git frustration if anybody wants to learn how to
deal with conflicts. Or a git expert could probably spend 5 minutes
to clear it all up.
Cheers,
- Graham
- git merge mess to sort out,
Graham Percival <=