Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- $ git merge --strategy-option ours
- error: 'merge' is not possible because you have unmerged files.
- hint: Fix them up in the work tree,
- hint: and then use 'git add/rm <file>' as
- hint: appropriate to mark resolution and make a commit,
- hint: or use 'git commit -a'.
- fatal: Exiting because of an unresolved conflict.
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement