Egit: how to merge after fetch (or pull)

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



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
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]