[
Date Prev][
Date Next][
Thread Prev][
Thread Next][
Date Index][
Thread Index]
[
List Home]
The issue really is with dealing with merge conflicts and having a visual merge tool to help resolve those. As I just mentioned, there are merge tools out there.
But integrating them into Eclipse is problematic. The best I've thought of us invoking git gui from the external tool prompt, as I used to before egit. You can then launch a merge from there and launch visual merge tools from there to fix conflicts. But egit isn't using .gitignore for derived resources so git gui always wants to check in your build output. So it's not a great solution.
Now if one does come up, I'd be happy to try it out. I'm not an Eclipse fanatic enough to say it has to be in Eclipse, but at the least, it has to be easy to do on Windows and Linux.
On Tue, Jun 8, 2010 at 4:05 PM, Alex Blewitt
<alex.blewitt@xxxxxxxxx> wrote:
Merging is one of the main reasons to a DVCS - it's dramatically more efficient than CVS is to the extent that it does it all for you automatically.
The only time I had to deal with merge commit problems with Git was when merging Apple's ZFS fork and the Open Solaris codebase which had no common Git ancestor. And there was no way I'd be doing something like that with either subversion or cvs.
Every other time, git merge just works and can replay deltas in order so even if the arch was a long time ago, you can still merge (unlike CVS where you have to ask the submitter to resent his patch against head).
Tools like gerrit make this even less of an issue since they show you all the diffs anyway.
That said, with EGit 0.8, you do have to drop to the command line to do some hints in a normal workflow. The 0.9 release due out in Sept will have fixed most of these issues. But it would almost certainly be easier to switch at the start of a sprint rather than at the end of one.
Alex
Sent from my iPad
On 8 Jun 2010, at 18:26, Alena Laskavaia <
elaskavaia.cdt@xxxxxxxxx> wrote:
> -1
> For next half a year we committing on 2 branches, I don't want to do
> merging using command line tools.
>
> On Tue, Jun 8, 2010 at 1:21 PM, Pawel Piech <
pawel.piech@xxxxxxxxxxxxx> wrote:
>> On 06/08/2010 08:55 AM, Doug Schaefer wrote:
>>
>> BTW, I'd go git/gerrit tomorrow, or maybe later today once I finish this
>> test git-cvsimport run. I am only held back by the wishes of the committers.
>>
>> Maybe we should recount the vote for moving to git and do some arm twistng
>> ;-) I vote +1 for moving, because waiting another year seems like an
>> eternity.
>>
>> Cheers,
>> Pawel
>>
>>
>>
>> :D
>>
>> _______________________________________________
>> cdt-dev mailing list
>>
cdt-dev@xxxxxxxxxxx
>>
https://dev.eclipse.org/mailman/listinfo/cdt-dev
>>
>>
>> _______________________________________________
>> cdt-dev mailing list
>>
cdt-dev@xxxxxxxxxxx
>>
https://dev.eclipse.org/mailman/listinfo/cdt-dev
>>
>>
> _______________________________________________
> cdt-dev mailing list
>
cdt-dev@xxxxxxxxxxx
>
https://dev.eclipse.org/mailman/listinfo/cdt-dev
_______________________________________________
cdt-dev mailing list
cdt-dev@xxxxxxxxxxx
https://dev.eclipse.org/mailman/listinfo/cdt-dev
