Geek Answers Handbook

Conflict with files. How can I continue?

I just pulled some changes from the remote repository containing the project of my team.

This is the message I received on request:

Checkout conflict

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

How do I continue from here? The message is very vague. Was there a mistake? Should I undo what I did? Should he?

+6
source share
3 answers

I ran into this problem today and the below solution works for me.

  1. Make nastiness This will combine all your local and conflicting changes.
  2. Make a bastard now
+9
source

, , .

, , () , , , .

+1

, ? ? EGit .

, , @lmray, , EGit, . EGit , , . , , , . , , - .

@B. - , git .

Digression: this is a mental setting if you (like me) were used to work with SVN, which would happily bring remote changes to a dirty local working file. Without saying what was better, just git works differently. I'm still struggling to convert my SVN intuition into suitable expectations for Git.

0
source

More articles:


All Articles