Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit / JGit » AST-based algorithm for Egit
AST-based algorithm for Egit [message #1734456] Wed, 08 June 2016 13:31 Go to next message
Liubov Sidorova is currently offline Liubov SidorovaFriend
Messages: 2
Registered: June 2016
Junior Member
Hi!

I am a Java developer. My team lead told me to create an Eclipse plug-in for Git branches merging. We are talking about source code conflicts first of all. One of the main requirements for my task is to perform source code comparison with AST-based algorithm.

I know that Egit is a very mature plug-in for Git branches merge. I think that I could incorporate my algorithm into Egit. However, I am not very confident what to start with. Could you please give me a piece of advice? Are there any concrete classes in Egit/Jgit that I need to override to implement my algorithm?
Re: AST-based algorithm for Egit [message #1734614 is a reply to message #1734456] Thu, 09 June 2016 23:21 Go to previous messageGo to next message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 944
Registered: July 2009
Senior Member
You could consider to implement a custom merge strategy implementing the mergeStrategy extension point
which was introduced in
https://git.eclipse.org/r/#/c/49800/
This was used by EMF Compare to implement an EMF model based merge strategy.
Re: AST-based algorithm for Egit [message #1734774 is a reply to message #1734614] Sat, 11 June 2016 19:32 Go to previous messageGo to next message
Liubov Sidorova is currently offline Liubov SidorovaFriend
Messages: 2
Registered: June 2016
Junior Member
Thank you for your recommendation!

Could I change diff algorithm to the custom one AST-based via this extension point or somehow else?
Re: AST-based algorithm for Egit [message #1734979 is a reply to message #1734774] Tue, 14 June 2016 11:17 Go to previous message
Matthias Sohn is currently offline Matthias SohnFriend
Messages: 944
Registered: July 2009
Senior Member
You can use the mergeStrategy extension point to implement a new merge strategy (externally) and use it in EGit.
Not sure if this is what you want.
Previous Topic:Does eGit work with RTC eclipse Plugin?
Next Topic:Create pull request while remaining in Eclipse IDE
Goto Forum:
  


Current Time: Mon Sep 25 16:56:43 GMT 2017

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

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