From: Enrico Weigelt <weigelt@metux•de>
To: git@vger•kernel.org
Subject: Re: Git branch workflow
Date: Tue, 23 Nov 2010 04:05:16 +0100 [thread overview]
Message-ID: <20101123030516.GA27595@nibiru.local> (raw)
In-Reply-To: <20101122170805.8jtzkqwxpcog0kgk@dennymagicsite.com>
* denny@dennymagicsite•com <denny@dennymagicsite•com> wrote:
> Consider a specific scenario:
> I am on dev server on master branch and I want to develop a specific
> feature F.
> I cut a Feature branch F from master and start working on the feature.
> Once I am done with most of the work on F and it works reasonably
> well, I want to push it to production, but .. before I do I realize
> that I want to make some CSS fixes to the site, unrelated to other
> branches, and I can wait with pushing Feature branch to Production
> until I fix up CSS reasonably well.
> Here is the question: do I cut the CSS branch from Master or do I cut
> it from the Feature branch?
My advise: always fork from the latest stable revision (in your case:
production server's master). Before merging, always rebase onto latest
master and possibly rerun the test cycle.
cu
--
----------------------------------------------------------------------
Enrico Weigelt, metux IT service -- http://www.metux.de/
phone: +49 36207 519931 email: weigelt@metux•de
mobile: +49 151 27565287 icq: 210169427 skype: nekrad666
----------------------------------------------------------------------
Embedded-Linux / Portierung / Opensource-QM / Verteilte Systeme
----------------------------------------------------------------------
next prev parent reply other threads:[~2010-11-23 13:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-11-22 17:08 Git branch workflow denny
2010-11-23 0:43 ` tom fogal
2010-11-23 3:05 ` Enrico Weigelt [this message]
2010-11-23 15:47 ` Drew Northup
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101123030516.GA27595@nibiru.local \
--to=weigelt@metux$(echo .)de \
--cc=git@vger$(echo .)kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox