This means that you have a file in your working copy that is untracked which also exists as a tracked file in the branch you're just about to merge. In your case Git doesn't know what to do as it doesn't want to overwrite files you might need. Your options are:
Basically, Git doesn't like to delete files unnecessarily so will want you to address the problem yourself before doing the merge. The error message does tell you which files are causing the problem so this should be pretty easy to fix.
Hope that helps, feel free to ask more questions if needed.
Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...
Connect with like-minded Atlassian users at free events near you!Find a group
Connect with like-minded Atlassian users at free events near you!
Unfortunately there are no AUG chapters near you at the moment.Start an AUG
We're bringing product updates and pro tips on teamwork to ten cities around the world.Save your spot