Advertisement
evilqubit

merging in git

May 29th, 2013
156
0
Never
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 0.07 KB | None | 0 0
  1. git checkout --ours index.html
  2. git checkout --theirs _layouts/default.html
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement