Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » Merge using Egit
Merge using Egit [message #885118] Tue, 12 June 2012 13:48 Go to next message
Mikael Petterson is currently offline Mikael PettersonFriend
Messages: 156
Registered: July 2009
Senior Member

I am trying out EGit ( been a cvs user).

I have the following setup:

I have the following for my repos:


And now I am working on a branch called:


Now I want merge it to develop. Then when it is tested and released I want to merge it to master.

How can I do this in EGit?



Re: Merge using Egit [message #892373 is a reply to message #885118] Wed, 27 June 2012 22:55 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 1007
Registered: July 2009
Senior Member
I'd recommend you go through the EGit training git exercises [1] to get familiar with EGit.
In order to bring your local change back to the central git repo you need to push your
change to the remote repository's remote (usually that's origin). If that fails with a non fast
forward error you first need to fetch new commits which reached the upstream branch earlier
than yours and then either merge or rebase your change, then try to push that again.

Previous Topic:transitioning from svn to git
Next Topic:Flash Builder (based on Eclipse 3.7.0) egit wrong installation
Goto Forum:

Current Time: Fri Apr 27 01:19:41 GMT 2018

Powered by FUDForum. Page generated in 0.02015 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software