[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Master ahead of staging
|
From: |
Han-Wen Nienhuys |
|
Subject: |
Re: Master ahead of staging |
|
Date: |
Sun, 16 Feb 2020 12:16:10 +0100 |
sorry, my mistake (another reason to move to different tooling.)
It looks like savannah doesn't want people to do non-ff pushes; I've pushed
staging to be at the same commit.
[hanwen@localhost scm]$ git push origin HEAD:staging
Total 0 (delta 0), reused 0 (delta 0)
To ssh+git://git.sv.gnu.org/srv/git/lilypond.git
c3cb102967..e3be140a81 HEAD -> staging
[hanwen@localhost scm]$ git push -f origin HEAD^:master
Total 0 (delta 0), reused 0 (delta 0)
remote: error: denying non-fast-forward refs/heads/master (you should pull
first)
To ssh+git://git.sv.gnu.org/srv/git/lilypond.git
! [remote rejected] HEAD^ -> master (non-fast-forward)
On Sun, Feb 16, 2020 at 12:11 PM <address@hidden> wrote:
> Hello,
>
> Master is now ahead of staging - this will break patchy staging right?
>
> --snip--
>
> input/regression/multi-measure-rest-reminder: a demo of user-defined
> grobs master
> author Han-Wen Nienhuys <address@hidden>
> Mon, 10 Feb 2020 21:10:35 +0000 (22:10 +0100)
> committer Han-Wen Nienhuys <address@hidden>
> Sun, 16 Feb 2020 10:16:56 +0000 (11:16 +0100)
> commit e3be140a8141f0236cd489cd97e7fcf735653a0b
>
> --snip--
>
> Han-wen, I think this is an accident and should have been pushed to
> staging instead?
>
> I cannot fix that.
>
> regards
>
> James
>
>
--
Han-Wen Nienhuys - address@hidden - http://www.xs4all.nl/~hanwen