How can I solve a conflict in a pull request with interface

I can not pull files and commit files. it is explained as files has been overwritten. i am only one user of this repository. So I am unable to push my files. previous files also changed by myself. Now I am unable to pull or push. I tried to view conflicts and it is also unable. If am only one person push files what is mean by conflicts here. it is really meaning less.  

0 answers

Suggest an answer

Log in or Sign up to answer
Community showcase
Published Oct 23, 2018 in Sourcetree

Tip from the team: configure your repos for hosting goodness!

Supported Platforms macOS Windows We recently introduced support for additional hosting services such as GitHub Enterprise, GitLab (Cloud, Community Edition, Enterprise Edition), and...

967 views 4 2
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