Eclipse Community Forums: EGit / JGit » AST-based algorithm for Egit

Help

Home

Home » Eclipse Projects » EGit / JGit » AST-based algorithm for Egit

Show: Today's Messages :: Show Polls :: Message Navigator

AST-based algorithm for Egit [message #1734456]

Wed, 08 June 2016 13:31

Liubov Sidorova

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?

Report message to a moderator

Re: AST-based algorithm for Egit [message #1734614 is a reply to message #1734456]

Thu, 09 June 2016 23:21

Matthias Sohn

Messages: 1268
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.

Report message to a moderator