What is the easiest way to get --ours and --theirs version of a file without overwriting working (checked out) version?

后端 未结 0 1603
难免孤独
难免孤独 2020-11-30 09:31

Basically all I want is to git checkout --ours A to /tmp/A.ours and git checkout --theirs /tmp/A.theirs without changing the current A

相关标签:
回答
  • 消灭零回复
提交回复
热议问题