Geek Answers Handbook

How do I resolve this git conflict?

  • I made a central split repo on foo.org.
  • user A executed git clone ssh://foo.org/blah.git
  • user A created the file 'lol', which is an empty file. Performs its local repo. Does git push
  • user B does mkdir foo and cd foo
  • user B then runs git clone ssh://foo.org/blah.git .
  • user B is editing the lol file.
  • user A is editing the lol file.
  • user A commits and git push to central repo

  • user B commits and git push and receives:

    error: some links to 'ssh: //foo.org/blah.git' could not be pressed so that you do not lose history, updates other than fast forwarding were rejected Combine deleted changes before clicking again. See Continuous Forward

  • user b does git pull

    From ssh: //foo.org/home/meder/central/foo 08a0cda..fba6968 master → origin / master Auto-merge LOL CONFLICT (content): Merge conflict in LOL Auto-merge error; fix conflicts and then record the result.

  • user b makes vim lol and edits the file to his liking. then git commit then tries and states:

    lol: merge required lol: unmerged (039727ec5a50d0ed45ff67e6f4c9b953bd23c17d) lol: unwashed (9307e337aa159ed6574eb84532f107685e46a16c) lol: unmerged (f88ad411f67850638bbdb

What should I do at this moment? I tried git merge , but it says fatal: You have not concluded your merge. (MERGE_HEAD exists) fatal: You have not concluded your merge. (MERGE_HEAD exists)

I know for sure that I'm doing something stupid. Can someone just point out what it is?

+6
git
source share
1 answer

In step 11, user b did "git add" to add his hand merge before "git commit"?

+1
source share

More articles:


All Articles