error on intial pull

on an initial pull on a branch i am getting this error:

error: The following untracked working tree files would be overwritten by merge:

list of file...

1 answer

Hi Edgardo,

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:

  1. Delete the file which is causing the merge error if you don't need it
  2. Rename it if you don't want to merge it with any other files from the merge
  3. Commit it in your working copy so you can merge it later

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.

Suggest an answer

Log in or Join to answer
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

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 ...

243 views 0 3
Read article

Atlassian User Groups

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!

Find my local user group

Unfortunately there are no AUG chapters near you at the moment.

Start an AUG

You're one step closer to meeting fellow Atlassian users at your local meet up. Learn more about AUGs

Groups near you
Atlassian Team Tour

Join us on the Team Tour

We're bringing product updates and pro tips on teamwork to ten cities around the world.

Save your spot