From: Tim Mazid <timmazid@hotmail.com>
To: git@vger.kernel.org
Subject: Re: Updating a branch.
Date: Wed, 28 Oct 2009 05:03:34 -0700 (PDT) [thread overview]
Message-ID: <26093449.post@talk.nabble.com> (raw)
In-Reply-To: <26015707.post@talk.nabble.com>
elyod72 wrote:
>
> I am a newbie to git, so please bear with me.
> Here is the scenario that I am struggling with:
>
> I have my Master branch.
> I then create a new branch named Test.
> I then make changes and additions to the test branch.
> At the same time I make changes to the Master branch.
> Now I want to update the Test branch with the latest information from the
> Master branch.
>
> How do I go about doing that?
>
> Thanks for you time and help.
>
I'm a newbie too, don't worry. :P
And what you're describing is pretty simple.
Just do
git checkout Test
git merge Master
Voila. :P
Obviously, if there are any conflicts, you'll have to resolve them with 'git
mergetool'.
Good luck,
Tim.
--
View this message in context: http://www.nabble.com/Updating-a-branch.-tp26015707p26093449.html
Sent from the git mailing list archive at Nabble.com.
prev parent reply other threads:[~2009-10-28 12:03 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-10-22 19:21 Updating a branch elyod72
2009-10-22 19:26 ` Avery Pennarun
2009-10-22 20:31 ` Tim Henigan
2009-10-28 12:03 ` Tim Mazid [this message]
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=26093449.post@talk.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).