Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » Conflict resolution graphical editor (like subclipse)
Conflict resolution graphical editor (like subclipse) [message #628918] Fri, 24 September 2010 13:17 Go to next message
Gena is currently offline Gena
Messages: 2
Registered: July 2009
Junior Member
Hello community!

At first, many thanks to all contributors for a very nice job!

I'm trying to do my first steps with git (of course via Egit) after some years of usage of svn (with subclipse).

The one thing i'm really missing now is the conflict resolution view/editor as implemented in subclipse. Am i doing something wrong, or is this feature not implemented yet? Is it possible to integrate the corresponding view/editor from subclipse, if both are installed within my eclipse.

Many thanks!

Gena
Re: Conflict resolution graphical editor (like subclipse) [message #629530 is a reply to message #628918] Tue, 28 September 2010 11:29 Go to previous messageGo to next message
Stefan Lay is currently offline Stefan Lay
Messages: 340
Registered: July 2009
Senior Member
> At first, many thanks to all contributors for a very nice job!
Many thanks!

> I'm trying to do my first steps with git (of course via Egit) after some
> years of usage of svn (with subclipse).
Good idea ;-)

> The one thing i'm really missing now is the conflict resolution
> view/editor as implemented in subclipse. Am i doing something wrong, or is
> this feature not implemented yet? Is it possible to integrate the
> corresponding view/editor from subclipse, if both are installed within my
> eclipse.

You're right, the feature is not implemented yet. It is however planned to
do that.

I realized that there is not yet a bug for this in the eclipse bugzilla. If
you want you can open one and even vote for it on order to accelerate the
implementation of such a conflict resolution view. I'm sure that you are not
the only user who desires it.

Best Regards,
Stefan
Re: Conflict resolution graphical editor (like subclipse) [message #629738 is a reply to message #629530] Wed, 29 September 2010 08:35 Go to previous message
Gena is currently offline Gena
Messages: 2
Registered: July 2009
Junior Member
Hello Stefan,

i've just posted the new feature request on the bugzilla:

https://bugs.eclipse.org/bugs/show_bug.cgi?id=326525

Many thanks and best regards from Karlsruhe!

Gena
Previous Topic:Status of .gitignore awareness in 0.9?
Next Topic:home directory wrong in jgit 0.8.4 using fetch
Goto Forum:
  


Current Time: Sat Aug 30 16:27:36 EDT 2014

Powered by FUDForum. Page generated in 0.01598 seconds