From: John Bito <jwbito@gmail.com>
To: git@vger.kernel.org
Subject: Egit: how to merge after fetch (or pull)
Date: Wed, 8 Apr 2009 14:56:23 -0700 [thread overview]
Message-ID: <3ae83b000904081456i37ad65ate133469fa9a8f23c@mail.gmail.com> (raw)
I'd like to pull a branch before I do more work on it. After fetch,
git status says the branch is behind origin by N commits.
Can you tell me if there is an operation I can do via egit to get the
origin changes onto my branch? (Most of the documentation I found for
Egit appears to be before the fetch command was implemented.)
In the mean time, I've been using 'git pull'. Unfortunately, I found
that it's important to shut down Eclipse while doing a git operation
using Cygwin - a GC run when Egit had a file open caused a problem in
the repository that subsequent pushes propagated to my GitHub
repository. It would be nice to work entirely within Eclipse.
Thanks!
John
next reply other threads:[~2009-04-08 21:58 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-04-08 21:56 John Bito [this message]
2009-04-09 3:39 ` Egit: how to merge after fetch (or pull) Robin Rosenberg
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=3ae83b000904081456i37ad65ate133469fa9a8f23c@mail.gmail.com \
--to=jwbito@gmail.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).