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?
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.