Guest User

Untitled

a guest
Aug 21st, 2014
303
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.16 KB | None | 0 0
  1. $ git merge other/master
  2. Auto-merging .gitignore
  3. CONFLICT (add/add): Merge conflict in .gitignore
  4. Automatic merge failed; fix conflicts and then commit the result.
Advertisement
Add Comment
Please, Sign In to add comment