Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- git merge master --no-ff --no-commit
- git diff --diff-filter=U -U0 #|grep "@@@" #if i want only number of conflicted lines
- git merge --abort
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
