On 6/5/18, 2:45 AM, "Thomas Morley" <thomasmorle...@gmail.com> wrote:
2018-06-05 4:14 GMT+02:00 Carl Sorensen <c_soren...@byu.edu>:
>
>
> On 6/4/18, 6:13 PM, "Thomas Morley" <thomasmorle...@gmail.com> wrote:
>
>
> That said, in our git we have a 'guile-v2-work'-branch, but it's not
> up to date...
>
> @David
> I think about updating this branch, it would be far easier to point
> interested people to this branch.
> Needed would be a rebase, probably with the need to solve
> merge-conflicts and I'd like to add some new patches of my own.
> What would be the git-syntax for it?
>
> First cut:
>
> git checkout guile-v2-work
> git rebase master
>
> Solve any merge conflicts.
>
Hi Carl,
if I understand correctly, the above will work on my local copy of
said branch, to get it public, the updates should be pushed to the
public branch.
For pushing usual patches to staging from a local branch I use:
git push origin HEAD:staging
git push origin HEAD:guile-v2-work
HTH,
Carl
_______________________________________________
bug-lilypond mailing list
bug-lilypond@gnu.org
https://lists.gnu.org/mailman/listinfo/bug-lilypond
