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
TAGS
Community showcase
Published in Sourcetree

Sourcetree for Windows - CVE-2019-11582 - Remote Code Execution vulnerability

A vulnerability has been published today in regards to Sourcetree for Windows.  The goal of this article is to give you a summary of information we have gathered from Atlassian Community as a st...

4,917 views 0 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