meta data for this page
  •  

merge

merge conflicts

git checkout --ours PATH/FILE
git checkout --theirs PATH/FILE