Create
cancel
Turn on suggestions
Auto-suggest helps you quickly narrow down your search results by suggesting possible matches as you type.
Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Products
See all
Community resources
Top groups
Explore all groups
Community resources
Learn
Community resources
Celebration

Earn badges and make progress

You're on your way to the next level! Join the Kudos program to earn points and save your progress.

Deleted user Avatar
Deleted user

Level 1: Seed

25 / 150 points

Next: Root

Avatar

1 badge earned

Collect

Participate in fun challenges

Challenges come and go, but your rewards stay with you. Do more to earn more!

Challenges
Coins

Gift kudos to your peers

What goes around comes around! Share the love by gifting kudos to your peers.

Recognition
Ribbon

Rise up in the ranks

Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!

Leaderboard

Join now to unlock these features and more

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

Jayan Anuranga
Jayan Anuranga Sep 22, 2017

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.  

Answer
Watch
Like Be the first to like this
275 views

1 answer

0 votes
Manju
Manju
Atlassian Team
Atlassian Team members are employees working across the company in a wide variety of roles.
Mar 07, 2019

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

Reply

Suggest an answer

Log in or Sign up to answer
Sourcetree
Sourcetree
TAGS
AUG Leaders

Atlassian Community Events

See all events