Git mergetool generates unwanted .orig files

前端 未结 10 2012
予麋鹿
予麋鹿 2020-11-30 16:16

When I do a merge conflict resolution with Kdiff3 (and other merge tool I tried) I noticed that on resolution a *.orig file is created. Is there a way for it to

10条回答
  •  独厮守ぢ
    2020-11-30 16:48

    I simply use the command

    git clean -n *.orig
    

    check to make sure only file I want remove are listed then

    git clean -f *.orig
    

提交回复
热议问题