Eclipse Community Forums
Forum Search:

Search      Help    Register    Login    Home
Home » Eclipse Projects » EGit » CheckoutConflictException during Pull
CheckoutConflictException during Pull [message #665639] Fri, 15 April 2011 10:42 Go to next message
sylvain.pras is currently offline sylvain.prasFriend
Messages: 9
Registered: April 2011
Junior Member
I often have this error during Pull :

Exception caught during execution of merge command. org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with files: etc ....

It happen when i have a modified file in my working directory, and there's a concurrent modification on the same file in the remote repository.

Why Egit doesn't manage to pass the file in merge satus, to let us resolve conflicts ?

Re: CheckoutConflictException during Pull [message #666125 is a reply to message #665639] Tue, 19 April 2011 08:08 Go to previous messageGo to next message
Stefan Lay is currently offline Stefan LayFriend
Messages: 342
Registered: July 2009
Senior Member
"Sylvain PRAS" <sylvain.pras@addonline.fr> wrote in message
news:io9709$bt6$1@news.eclipse.org...
>I often have this error during Pull :
>
> Exception caught during execution of merge command.
> org.eclipse.jgit.errors.CheckoutConflictException: Checkout conflict with
> files: etc ....
>
> It happen when i have a modified file in my working directory, and there's
> a concurrent modification on the same file in the remote repository.
>
> Why Egit doesn't manage to pass the file in merge satus, to let us resolve
> conflicts ?

This is done on purpose, and is the same in native git. The merge which is
done during pull already merges the file from the pulled branch with the
file in your HEAD commit. When there are additional changes in your working
directory or even in your index, the merge would be way too complex.

Please have a look at the git docu
http://www.kernel.org/pub/software/scm/git/docs/git-merge.ht ml, "PRE-MERGE
CHECKS": "git pull and git merge will stop without doing anything when local
uncommitted changes overlap with files that git pull/git merge may need to
update."

Stefan
Re: CheckoutConflictException during Pull [message #666605 is a reply to message #665639] Thu, 21 April 2011 09:46 Go to previous message
sylvain.pras is currently offline sylvain.prasFriend
Messages: 9
Registered: April 2011
Junior Member
Thank you very much,

I suspected that i should commit my modificatons in the local repository before "pulling"; you confirm that.
Previous Topic:Syntax coloring problem
Next Topic:Installation of EGit - Error
Goto Forum:
  


Current Time: Sat Dec 20 18:12:03 GMT 2014

Powered by FUDForum. Page generated in 0.10816 seconds
.:: Contact :: Home ::.

Powered by: FUDforum 3.0.2.
Copyright ©2001-2010 FUDforum Bulletin Board Software