A basic question for push and pull

Say team member A made code change and pushed it  to the remote server.(Bitbucket)

I am going to pull it to my local. However I found that there is still an error. I fix it and ready to push it. What is the correct steps.

Would you please use step 1,step 2 etc..?

Sourcetree.PNG

Thanks

1 answer

1 accepted

  1. Pull
  2. (resolve merge conflicts, if any)
  3. Push

Do I have to pull his code first? See my updated image.

Edited the answer to match the picture.

don't forget to commit whatever changes/fixes you made before pushing

Suggest an answer

Log in or Sign up to answer
Atlassian Community Anniversary

Happy Anniversary, Atlassian Community!

This community is celebrating its one-year anniversary and Atlassian co-founder Mike Cannon-Brookes has all the feels.

Read more
Community showcase
Brian Ganninger
Published Jan 23, 2018 in Sourcetree

Tip from the team: workflow and keyboard shortcuts

Supported Platforms macOS Sourcetree has a lot to offer and, like many developer tools, finding and using it all can be a challenge, especially for a new user. Everyone might not love ...

676 views 0 4
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