Hi,
OK I didn't have a look in details to JGit, but with the native git
used by the GUI, we have some issues
I will take 3 examples
1. Merge conflict using git pull
When you "git pull" and have conflicts, it ask you to solve the
conflicts (git add) and continue with (git commit). With the current
implementation, it's not possible as you can't perform the command
"git commit" without options ....
With JGit you can detect that you are in a "conflict" state and
suggest the right resolution step in the UI.
2. conflict while rebasing
It doesn't exist in the Git plugin but if you use git rebase it will
ask you to solve conflicts and do actions: git rebase --continue
after solving conflicts, or git rebase --abort to cancel. In both
case, you will be stuck, and it's hard to handle that situation by
embedding Git.
In Eclipse IDE (using JGit) it handles the conflicts properly:
asking me in the UI the actions to do. I guess there are some
handlers behind it: easier to detect and to handle with Java.
3. push is asking for passphrase ... but not handle by UI
Usually i prefer using ssh key with passphrase. But using the native
git command, it will ask my passphrase in the console ... not in the
Web UI ...
Git native command is good when using it as a CLI. A lot of git
commands needs interaction and is part of a global workflow. It's
not impossible, but it's harder to deal with these cases with a
embeded native git client.
Le 25/03/2015 15:56, Sergii Kabashniuk
a écrit :
Sorry
that was fast response. :)
For
instance it was very surprised to see 200Mb files in his
history.
And
this use case was not the last.
Can
you elaborate more about what are you missing for git
conflict resolving?
_______________________________________________
che-dev mailing list
che-dev@xxxxxxxxxxx
To change your delivery options, retrieve your password, or unsubscribe from this list, visit
https://dev.eclipse.org/mailman/listinfo/che-dev
|