From: thepurpleblob <howardsmiller@googlemail.com>
To: git@vger.kernel.org
Subject: merge confusion
Date: Fri, 31 Jul 2009 05:35:54 -0700 (PDT) [thread overview]
Message-ID: <24755682.post@talk.nabble.com> (raw)
I had some unexpected behaviour doing a merge today. I wonder if anybody can
tell me where I have gone wrong. This is the sequence...
* clone a remote repo
* created a local branch to track one of the remote branches
* did work on the local branch and then created another 'feature' branch
from that
* time elapsed and at some point(s) I pulled from the remote but did not
merge the original local branch
* finished feature, checkout local branch and merge in feature.
What I didn't expect is that all the subsequent changes on the tracked
remote branch got merged in too. Which I didn't want.
So the question is - is that what's supposed to happen (ie. if you do any
merge the tracked branch 'fast forwards' the remote) and, if so, if I want a
branch that stays a branch (doesn't ever merge with the remote) how would I
do that?
Thanks!
--
View this message in context: http://www.nabble.com/merge-confusion-tp24755682p24755682.html
Sent from the git mailing list archive at Nabble.com.
next reply other threads:[~2009-07-31 12:36 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-31 12:35 thepurpleblob [this message]
2009-07-31 13:32 ` merge confusion Allen Johnson
2009-07-31 16:29 ` Sean Estabrooks
2009-10-28 12:01 ` Tim Mazid
2009-10-28 15:43 ` Alex Riesen
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=24755682.post@talk.nabble.com \
--to=howardsmiller@googlemail.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.