Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- Auto-merged README
- CONFLICT (content): Merge conflict in README
- Automatic merge failed; fix conflicts and then commit the result.
- lynx:~/test_clone$ ls
- README
- lynx:~/test_clone$ git add README
- lynx:~/test_clone$ git commit -a
- Created commit 46ee062: It works!
- lynx:~/test_clone$ ls
- README
- lynx:~/test_clone$ cat README
- <<<<<<< HEAD:README
- testingtesting
- =======
- hmm
- >>>>>>> 881d60f5f738bc5716f5c9a9384e262b535717fd:README
- lynx:~/test_clone$
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement