From: Bradley Wagner <bradley.wagner@hannonhill.com>
To: git@vger.kernel.org
Subject: workflow for working on feature branches and incrementally incorporating "master" changes
Date: Tue, 10 Aug 2010 16:20:16 -0400 [thread overview]
Message-ID: <AANLkTi=h2MbSKmQk9p6w44WORAa8XzkpF0nBXKOgJ4T1@mail.gmail.com> (raw)
If you're working on a feature branch by yourself, what is a good
workflow for keeping the branch in up-to-date with "master" as you're
developing on the feature branch or is this unnecessary? Should you
just wait until you want to officially integrate the feature branch
into the "master"?
We were doing:
commit to local feature branch
push to remote feature branch
... repeat....
rebase from master (occasionally)
push to remote
but at this point the branches have diverged.
We're coming at this from SVN, so we might just be thinking about this
the wrong way.
Thanks!
next reply other threads:[~2010-08-10 20:20 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2010-08-10 20:20 Bradley Wagner [this message]
2010-08-10 21:02 ` workflow for working on feature branches and incrementally incorporating "master" changes Ævar Arnfjörð Bjarmason
2010-08-10 22:05 ` Chris Mear
2010-08-10 22:26 ` Joshua Shrader
2010-08-13 20:38 ` Bradley Wagner
2010-08-10 22:32 ` Jon Seymour
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='AANLkTi=h2MbSKmQk9p6w44WORAa8XzkpF0nBXKOgJ4T1@mail.gmail.com' \
--to=bradley.wagner@hannonhill.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
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;
as well as URLs for NNTP newsgroup(s).