git checkout --ours filename.c
git checkout --theirs filename.c
git add filename.c
git commit -m "using theirs"
git merge
最新推荐文章于 2025-03-29 09:00:00 发布
git checkout --ours filename.c
git checkout --theirs filename.c
git add filename.c
git commit -m "using theirs"