Too many ambiguous portfolioManger Application files

after running git mergetool I got too many files in red colour and I doubt if it is an error becuase of their red colour, what is these files can anybody tell


@vaibhavraj10 @Midhun

@divs30 Keep only the last file ProtfolioManagerApplication.java and remove above files. This will be used for unit testing.

1 Like

do I need to delete above 4 @vaibhavraj10

1 Like

Yes, You have to delete the above 4

1 Like

thank you so much :slight_smile:

1 Like

@divs30 if it worked for you, please upvote it as solution. :smile:

1 Like

Git merge tool is a utility to resolve merge conflicts efficiently. You can otherwise resolve them manually. When you run the merge tool git will create multiple instances of the file. Each containing different code. You just need to delete the irrelevant files.

To learn more about merge tool you can refer to this doc -
https://git-scm.com/docs/git-mergetool

1 Like

thank you for the resources