Advertisement
Guest User

Git: Adding conflicted files

a guest
May 6th, 2010
446
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
Bash 0.45 KB | None | 0 0
  1. Auto-merged README
  2. CONFLICT (content): Merge conflict in README
  3. Automatic merge failed; fix conflicts and then commit the result.
  4. lynx:~/test_clone$ ls
  5. README
  6. lynx:~/test_clone$ git add README
  7. lynx:~/test_clone$ git commit -a
  8. Created commit 46ee062: It works!
  9. lynx:~/test_clone$ ls
  10. README
  11. lynx:~/test_clone$ cat README
  12. <<<<<<< HEAD:README
  13. testingtesting
  14. =======
  15. hmm
  16. >>>>>>> 881d60f5f738bc5716f5c9a9384e262b535717fd:README
  17. lynx:~/test_clone$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement