Merge tool creates backup files having .orig extension

Should I bother for these files? This got created automatically. Should I keep it or delete it?

Please specify the filenames.

PortfolioManagerApplication.java.orig

This file is same as PortfolioManagerApplication.java
Having Similar merge conflicts

Hi @dsc712,

Those files are completely fine and we can delete the rest apart from the PortfolioManagerApplication.java.

This has been mentioned in the documentation of git-mergetool as mentioned here by @Sakshat-Crio.Do

3 Likes

Thanks. Will do it.
According to docs, I can also set mergetool.keepBackup configuration variable to false for automatically deleting the backup files.

Hey, is your issue resolved yet?

Yes, issue resolved.