Initiating a merge from within Eclipse to the master branch on the JazzHub repo
Hi all,
I'm want to use Eclipse to manage my nodejs app hosted on Bluemix (and versioned controlled in a GIT repo managed on jazzhub). So I cloned the jazzhub repo locally in Eclipse (didn't started to extend the jazzhib config with additional branches), edit my code in Eclipse then commit and push the changes. Now, actually I have to operate the merge between the contribution issued from my local repo towards the master branch in the jazzhub repo through the bluemix web interface.
Is there a way to perform that merge operation from within my eclipse?
If so, any tips/inputs are welcome!
Regards, Olivier.
Hi Olivier, you can use EGit within Eclipse to commit and push directly to your Git repository in DevOps Services. Once you have pushed from EGit there is no further merge needed from within the web interface.
If you are wondering about how to merge the changes into the DevOps Web IDE workspace, you need to click the Git icon on the left hand side of the page, then click "Sync" to pull in all the changes. The Web IDE contains just another clone of the repository, just like you have on your local desktop.
Does that answer your question? There is more reference documentation that might help you out here:
https://hub.jazz.net/docs/reference/gitclient
John