Skip to main content



      Home
Home » Eclipse Projects » EGit / JGit » Merge using Egit
Merge using Egit [message #885118] Tue, 12 June 2012 09:48 Go to next message
Eclipse UserFriend
Hi,

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

I have the following setup:

I have the following for my repos:

/origin/master
/origin/develop

And now I am working on a branch called:

fr_3432763_extdiffnew

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?

br,

//mike





Re: Merge using Egit [message #892373 is a reply to message #885118] Wed, 27 June 2012 18:55 Go to previous message
Eclipse UserFriend
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.

[1] https://docs.google.com/folder/d/0B4F_gjXVrHZVRXkydE0xVFBRRkc1WUpEcXdwQ2I1dw/edit?pli=1&docId=0B4F_gjXVrHZVc015aTNiNmhScktlcDJJTGNZd1NlQQ
Previous Topic:transitioning from svn to git
Next Topic:Flash Builder (based on Eclipse 3.7.0) egit wrong installation
Goto Forum:
  


Current Time: Tue Jun 17 19:45:22 EDT 2025

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

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

Back to the top