[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Lilypond-auto] [LilyIssues-auto] [testlilyissues:issues] #4824 CG - pus

From: Auto mailings of changes to Lily Issues
Subject: [Lilypond-auto] [LilyIssues-auto] [testlilyissues:issues] #4824 CG - pushing to staging instructions
Date: Tue, 19 Apr 2016 11:35:38 +0000

Patch counted down. Please push.

[issues:#4824] CG - pushing to staging instructions

Status: Started
Created: Mon Apr 11, 2016 10:15 AM UTC by Federico Bruni
Last Updated: Sat Apr 16, 2016 11:09 AM UTC
Owner: Paul Morris

First report:

What do you think about these instructions?

I have a few comments, but I'm not sure about any of them:

  1. There's no real purpose in pulling and rebasing the staging branch, assuming that this branch should be "clean" (we should work on master or on a local branch).

  2. That page should explain how to generate a patch with format-patch. I think that git format-patch origin works most of the times, at least in my setup.

  3. I don't like much the git merge approach suggested for those who work with local branches, as the git log is a bit messed up (a merge commit is added, often faraway from the commit containing the real changes). I'd rather suggest using format-patch and git am even in this case.

I like Benko's approach:

$ git checkout my_branch_name
$ git fetch
$ git rebase origin/staging
[fix conflicts, run all checks, repeat from fetch, etc.]
$ git push origin HEAD:staging

Another demand for a "merge-less" approach:

See also comment from Harm:

Sent from because address@hidden is subscribed to

To unsubscribe from further messages, a project admin can change settings at Or, if this is a mailing list, you can unsubscribe from the mailing list.

Find and fix application performance issues faster with Applications Manager
Applications Manager provides deep performance insights into multiple tiers of
your business applications. It resolves application problems quickly and
reduces your MTTR. Get your free trial!;130105516;z
Testlilyissues-auto mailing list

reply via email to

[Prev in Thread] Current Thread [Next in Thread]