Create
cancel
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in

It's not the same without you

Join the community to find out what other Atlassian users are discussing, debating and creating.

Atlassian Community Hero Image Collage

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.  

1 answer

0 votes
Manju Atlassian Team Mar 07, 2019

Is there any error that git/Sourcetree log that you can paste here?

Suggest an answer

Log in or Sign up to answer
TAGS
Community showcase
Published 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...

5,742 views 4 12
Read article

Community Events

Connect with like-minded Atlassian users at free events near you!

Find an event

Connect with like-minded Atlassian users at free events near you!

Unfortunately there are no Community Events near you at the moment.

Host an event

You're one step closer to meeting fellow Atlassian users at your local event. Learn more about Community Events

Events near you