|
Hi,
I also was able to do a merge pretty easily with
EGit. Rebases work super nice and the only performance issue I see is when
doing a commit, where it takes more time than I would like.
As pointed out, the doc is impressively
detailed: http://wiki.eclipse.org/EGit/User_Guide
OK,
I have merge and conflict resolution working. When reading the EGit user doc,
pay careful attention to where it tells you to Add the file that was in
conflict. Add basically tells git to recognize that the file has changed on
purpose and to prepare for it to get checked in.
If
you don’t have conflicts, BTW, merge works fine.
So
I think that’s it unless anyone has something.
Doug.
From:
cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf
Of Schaefer, Doug
Sent: Monday, June 20, 2011 12:20
PM
To: CDT General developers list.
Subject: Re: [cdt-dev]
CDT git update
BTW,
the EGit user documentation is actually pretty good and documents all the
workflows we care about. Please take a look.
Thanks,
Doug.
From:
cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf
Of Schaefer, Doug
Sent: Monday, June 20, 2011 12:02
PM
To: CDT General developers list.
Subject: Re: [cdt-dev]
CDT git update
Agreed.
I’m documenting the workflows to avoid using the Synchronized view because of
this.
From:
cdt-dev-bounces@xxxxxxxxxxx [mailto:cdt-dev-bounces@xxxxxxxxxxx] On Behalf
Of Andrew Gvozdev
Sent: Monday, June 20, 2011 12:00
PM
To: CDT General developers list.
Subject: Re: [cdt-dev]
CDT git update
Hi Doug,
This is not really a blocker for me anymore, but we need to
improve performance of Synchronize View as well - in particular synchronizing
uncommitted changes with index locally - see bug 323839. It
appears that the problem is not identical to Commit performance as Synchronize
is visibly slower than commit.
Andrew
On Mon, Jun 20, 2011 at 11:44 AM, Schaefer, Doug <Doug.Schaefer@xxxxxxxxxxxxx>
wrote:
Hey
gang,
I’ve figured out
the patch workflow. Turning on the “git patch” option produces patches that
will work with our repo structure. I’ll produce a video showing that off this
afternoon.
The egit gang
are looking at the performance issue and have a solution they’re working on.
The delays are annoying but don’t block any of our mandatory
workflows.
The final
workflow I’m trying to figure out is merge conflict resolution. I’ll work on
that today. If I can get that together, I’ll give my green light for the
move.
The greater
Eclipse community has a close eye on us and I am getting a lot of help to try
and ensure we have a good experience. There is clear momentum to get all
Eclipse projects onto git as soon as possible. So the good news is that we
aren’t alone in this adventure. J
If you find any
blockers, please let me know ASAP and I’ll try and get them
addressed.
Thanks,
Doug.
_______________________________________________
cdt-dev
mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev
|
