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

0 votes
Accepted answer
  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
Community showcase
Published Oct 23, 2018 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...

841 views 3 2
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