Egit: how to merge after fetch (or pull)

Egit: how to merge after fetch (or pull)

[John Bito]

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

Re: Egit: how to merge after fetch (or pull)

[Robin Rosenberg]

onsdag 08 april 2009 23:56:23 skrev John Bito <jwbito@gmail.com>:
> 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.

A very recent update to msysgit (not git core and hence not cygwin) might help there. 
Windows locks files when reading and the Eclipse plugin reads things from the
repo when changes are detected to see if anything interesting is there. The fix
in msysgit retries certain operations a number of times if they fail with access denied,
which is what you get if the file is open for reading.

Built-in pull is not there just yet.

-- robin