Graham Percival <gra...@percival-music.ca> writes: > On Mon, Oct 24, 2011 at 08:53:16AM +0200, David Kastrup wrote: >> Graham Percival <gra...@percival-music.ca> writes: >> >> > Hmm. At the moment, master and dev/staging cannot be "combined" >> > (to use hopefully non-specific terminology) with --ff-only. >> > Bertrand's 6ee8c04678442855cb794d4598c056c15c42673b gets in the >> >> I'd do something like >> >> git fetch >> git rebase origin/master origin/dev/staging >> [Note that you are now outside of any branch] >> ..test... >> git push origin HEAD:master > > What happens if there's other commits in master? The full test > takes about an hour, so it's entirely possible that something else > will be pushed in the interim.
The push will fail. Nothing gets overwritten. > Will it work if I do > git fetch > git rebase origin/master > git push origin HEAD:master Yes. -- David Kastrup _______________________________________________ lilypond-devel mailing list lilypond-devel@gnu.org https://lists.gnu.org/mailman/listinfo/lilypond-devel
