Too many ambiguous portfolioManger Application files

QMoney Module 3
#1

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

new1
new1922×219 24.5 KB

@vaibhavraj10 @Midhun

#2

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

1 Like
#3

do I need to delete above 4 @vaibhavraj10

1 Like
#4

Yes, You have to delete the above 4

1 Like
#5

thank you so much :slight_smile:

1 Like
#6

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

1 Like
#7

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
#8

thank you for the resources

#9