git accept all current changes merge conflicts command line code example Example: git take ours git pull -X theirs