Intellipaat Back

Explore Courses Blog Tutorials Interview Questions
0 votes
2 views
in DevOps and Agile by (19.4k 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 (27.5k 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

31k questions

32.8k answers

501 comments

693 users

Browse Categories

...