[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Unable to merge staging
From: |
David Kastrup |
Subject: |
Re: Unable to merge staging |
Date: |
Thu, 13 Feb 2014 10:13:07 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/24.3.50 (gnu/linux) |
James <address@hidden> writes:
> Hello,
>
> I've cleared out my .lilypond-patchy-cache too. But I cannot force
> patchy to merge staging.
>
> I've not had this error before, I understand what it means but not how
> it happened.
Francisco pushed commits directly to master instead of staging. I've
taken a look through the commits, but at least
commit b8f58d9897229562d1fb2dc558f8f4309005008d
Author: Francisco Vila <address@hidden>
Date: Fri Feb 7 12:01:47 2014 +0100
Doc: misplaced comments produce wrong HTML output.
is totally wrong (I don't think was ever entered into review and cannot
find the commit id in the issue tracker) since the problems will get
reintroduced when makelsr is getting run: the problems need to get fixed
in Documentation/snippets/new instead and propagated with makelsr.
Since we made it a policy to _never_ rewind master, I will revert that
commit, push the result from reverting that commit to staging (which
puts staging back ahead of master), and then we'll see whether it goes
through.
If not, more reverts will be required.
--
David Kastrup
- Unable to merge staging, James, 2014/02/13
- Re: Unable to merge staging, James, 2014/02/13
- Re: Unable to merge staging,
David Kastrup <=
- Re: Unable to merge staging, Phil Holmes, 2014/02/13
- Re: Unable to merge staging, Francisco Vila, 2014/02/13
- Re: Unable to merge staging, James, 2014/02/13
- Re: Unable to merge staging, Francisco Vila, 2014/02/13
- Re: Unable to merge staging, Phil Holmes, 2014/02/13