|From:||Auto mailings of changes to Lily Issues|
|Subject:||[Lilypond-auto] [LilyIssues-auto] [testlilyissues:issues] #4824 CG - pushing to staging instructions|
|Date:||Thu, 21 Apr 2016 12:20:20 +0000|
author Paul Morris address@hidden
Tue, 12 Apr 2016 21:47:43 +0100 (16:47 -0400)
committer Paul Morris address@hidden
Tue, 19 Apr 2016 15:09:07 +0100 (10:09 -0400)
[issues:#4824] CG - pushing to staging instructions
Created: Mon Apr 11, 2016 10:15 AM UTC by Federico Bruni
Last Updated: Tue Apr 19, 2016 11:35 AM UTC
Owner: Paul Morris
What do you think about these instructions?
I have a few comments, but I'm not sure about any of them:
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).
That page should explain how to generate a patch with format-patch. I think that
git format-patch originworks most of the times, at least in my setup.
I don't like much the
git mergeapproach 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: http://lists.gnu.org/archive/html/lilypond-devel/2016-04/msg00054.html
See also comment from Harm:
Sent from sourceforge.net because address@hidden is subscribed to https://sourceforge.net/p/testlilyissues/issues/
To unsubscribe from further messages, a project admin can change settings at https://sourceforge.net/p/testlilyissues/admin/issues/options. 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! https://ad.doubleclick.net/ddm/clk/302982198;130105516;z
_______________________________________________ Testlilyissues-auto mailing list address@hidden https://lists.sourceforge.net/lists/listinfo/testlilyissues-auto
|[Prev in Thread]||Current Thread||[Next in Thread]|