Forums/Community/Feature Requests

PlannedDoneNot planned

Add a merge GUI

Chris Le
suggested this on November 23, 2011 12:27

Hi,

 

is it possible to add a GUI for the git merge command?

I would like to solve merge conflicts via a GUI like in Netbeans, Visual Studio, Eclipse or smth like that and not via the console.

 

Best Regards

Chris

 

Comments

User photo
Detmar ter Huurne
Cloud9 IDE, Inc

Thank you for your request, Chris.

This would be an awesome feature. We already have been working on a Git Gui.

November 23, 2011 13:18
User photo
Kythin

+1 for Git GUI :)

November 24, 2011 15:21
User photo
Galuszkak

For mercurial too? Nice merge tool will be nice.

January 04, 2012 17:33
User photo
Chris Le

Hope the features will be:

Accept the changes from the remote repository, Accept changes from the working tree, accept nothing or accept both. I use netbeans and I only can Accept HEAD, Accept Remote Repository or nothing, but not both xD.

February 21, 2012 18:52
User photo
Jason Griffin

It would be great to support local diff tools like Araxis as well.

July 14, 2012 06:56
User photo
Nick

Yes, it's 2012 and not the early 1990's.  A GUI would nice :)

September 07, 2012 19:22
User photo
Nick

Looks like there are some features already.  If you got to Tools (top menu) >> Git (sub menu) >> you'll see a list of the following commands:

  • Status
  • Push
  • Pull
  • Stash
  • Blame
  • Commit
  • Checkout 
September 07, 2012 19:35
User photo
Pieter Wigboldus

It look like the git (sub menu) is already removed by Cloud9.
Why is this removed already? And will it be added soon again? 

April 11, 2013 15:36
User photo
Christian Manson

This has a status of Planned. Any idea of the time frames yet? 

April 16, 2013 17:08