A basic question for push and pull

Hui Zhao May 27, 2015

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
Answer accepted
Balázs Szakmáry
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 27, 2015
  1. Pull
  2. (resolve merge conflicts, if any)
  3. Push
Hui Zhao May 27, 2015

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

Balázs Szakmáry
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 27, 2015

Edited the answer to match the picture.

Tim Crall
Rising Star
Rising Star
Rising Stars are recognized for providing high-quality answers to other users. Rising Stars receive a certificate of achievement and are on the path to becoming Community Leaders.
May 27, 2015

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

Suggest an answer

Log in or Sign up to answer
TAGS
AUG Leaders

Atlassian Community Events