Showing results for 
Search instead for 
Did you mean: 
Sign up Log in
Deleted user
0 / 0 points
badges earned

Your Points Tracker
  • Global
  • Feed

Badge for your thoughts?

You're enrolled in our new beta rewards program. Join our group to get the inside scoop and share your feedback.

Join group
Give the gift of kudos
You have 0 kudos available to give
Who do you want to recognize?
Why do you want to recognize them?
Great job appreciating your peers!
Check back soon to give more kudos.

Past Kudos Given
No kudos given
You haven't given any kudos yet. Share the love above and you'll see it here.

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

When a team member push to repo my changes become a branch - Sourcetree/Git Edited

When a team member pushes to the repo my changes become a branch. So, in order for me to push, I have to Stash my changes, make a Pull and then Apply Stash. If I try to Pull without Stashing I get a merge error. Any work around on this? You know, make a pull and then push my changes without stashing. Not sure what I changed in my setting that is causing this. Thanks.

1 answer

1 accepted

0 votes
Answer accepted
Mike Corsaro Atlassian Team Mar 28, 2018

Hello! This sounds like you're both on the same branch. You can verify which branch you're on from the indicator in the sidebar. If you're both on the same branch, you'll need to make a new branch to prevent this from happening (and when you're done with the work on that branch you'll need to make a pull-request to merge the changes to the main branch).

Yes, we are working on the same branch and I get an error when trying to Pull because git is avoiding to overwrite my local changes. Creating a branch is the right way. This is a good read about: Merging vs. Rebasing. Thanks.

Suggest an answer

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

3,290 views 4 5
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