Egit: how to merge after fetch (or pull)
- From
John Bito <jwbito@gmail.com>
- Date
- Apr 8, 2009, 21:56 UTC
- Message-ID
- <3ae83b000904081456i37ad65ate133469fa9a8f23c@mail.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.
Thanks! John