Checkout conflict with files. How do I proceed?

java eclipse egit jgit vcs-checkout
CodyBugstein picture CodyBugstein · Sep 9, 2014 · Viewed 44.7k times · Source

I just pulled some changes from a remote repository holding my teams project.

This is the message I received on pull:

Checkout Conflict

Apparently, one of my partners made changed to the same file as me.

How do I proceed from here? The message is very vague. Was there an error? Do I have to undo what I did? Does he have to?

Answer

Pushkin picture Pushkin · Apr 6, 2016

I faced this issue today and below solution works for me.

  1. Do a git stash. This will consolidate all your local and conflicting changes.
  2. Do a git pull now

Related questions

Confusion in choosing between JavaGit, JGit and EGit

I am making a Java application that uses Git. I found that there is something called JavaGit, EGit and JGit. I know that JavaGit and EGit/JGit are different. What I don't understand is the difference between EGit and JGit. …

Read More
How to make a simple revert work on Git / EGit?

Ok. Simple things should be simple, so I hope it is. :) I have changed a file, now I want to revert back to the latest version in the git repo because my changes are crap and I want to start …

Read More
How to import a GIT non-Eclipse Java project into Eclipse?

I have some problems importing a Java project into my workspace. I am following this tutorial - however I can not use the final Import existing projects step because the GIT repository I use does not include the Eclipse specific .…

Read More