Advertisement
Not a member of Pastebin yet?
Sign Up,
it unlocks many cool features!
- git checkout --ours index.html
- git checkout --theirs _layouts/default.html
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement