From: Tim Mazid <timmazid@hotmail.com>
To: git@vger.kernel.org
Subject: Re: Working on merged branches whilst seeing current master
Date: Thu, 12 Nov 2009 04:48:38 -0800 (PST) [thread overview]
Message-ID: <1258030118389-3992599.post@n2.nabble.com> (raw)
In-Reply-To: <20091111215727.GK27518@vidovic>
Nicolas Sebrecht-3 wrote:
>
> The 11/11/09, rhlee wrote:
>>
>> I use branches for features. I have a branch and I merged it into my
>> master
>> branch as I thought it was finished. But it turns out I wasn't and so I
>> need
>> to work on it again.
>>
>> I have made some more changes (branches and merges) on master. So what I
>> should do is checkout that branch, work on it committing along the way
>> and
>> then merge it again onto my master branch.
>>
>> However I though I am working on a feature branch I want to be also
>> working
>> from the master branch as reference.
>
> If the feature branch is merged to the mainline, it should really mean
> that the feature is ready : the feature branch life stop here. This also
> means that if you see that this feature was not as ready as you thought,
> you have to restart a _new_ feature branch off of the mainline.
>
Actually, there's no reason you couldn't just 'git reset HEAD^' once you
realise that the branch isn't ready. If you want to see the changes from
master, you could just merge that into your branch. If you just want to see
the content in master, you could use gitk or gitg, which allows you to view
files at any commit.
Personally, I merge master into my branches, test and check, and fix, then
merge the branch into master. This sometimes results in a fast-forward, if
you haven't made changes to master. If you don't like that, you can always
use the --no-ff option, though.
Good luck,
Tim.
--
View this message in context: http://n2.nabble.com/Working-on-merged-branches-whilst-seeing-current-master-tp3987667p3992599.html
Sent from the git mailing list archive at Nabble.com.
next prev parent reply other threads:[~2009-11-12 12:48 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-11-11 17:16 Working on merged branches whilst seeing current master rhlee
2009-11-11 21:57 ` Nicolas Sebrecht
2009-11-12 12:48 ` Tim Mazid [this message]
2009-11-12 16:49 ` rhlee
2009-11-26 12:45 ` Tim Mazid
2009-11-12 14:57 ` rhlee
2009-11-12 15:14 ` Nicolas Sebrecht
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=1258030118389-3992599.post@n2.nabble.com \
--to=timmazid@hotmail.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).