Re: [egit-dev] Google Summer of Code (GSOC) Participation

[Christian Halstrick <christian.halstrick@xxxxxxxxx>]

Hi,

> > > * add tagging support
> > > * add merging support
> > > * add stash support
> > > * add branch/tags comparing support

...

 

merge and stash. branch/tags comparing support is already in JGit AFAICT.

The basic merge algorithm is already in [0]. A merge command is proposed and the
first merge strategy "resolve" is also working locally but waiting for some comments
on [1] before the last bugs can be resolved. But there is a lot to do in this area: There

are more strategies to be implemented, the diff is lacking a of of options of native git ...

The support to compare two revisions is also already in [3]

[0] http://egit.eclipse.org/r/#change,140

[1] http://dev.eclipse.org/mhonarc/lists/jgit-dev/msg00169.html
[3] http://egit.eclipse.org/r/#change,319

Ciao
  Chris