Should I bother for these files? This got created automatically. Should I keep it or delete it?
Please specify the filenames.
This file is same as PortfolioManagerApplication.java
Having Similar merge conflicts
Those files are completely fine and we can delete the rest apart from the
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.