0 votes
1 view
in DevOps and Agile by (20k points)

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 not create that extra file?

1 Answer

0 votes
by (28.4k points)

This command should do the magic:

$ git clean -n *.orig

check is the files you want to remove are listed or not

$ git clean -f *.orig

Welcome to Intellipaat Community. Get your technical queries answered by top developers !


Categories

...