A basic question for push and pull

[Hui Zhao]

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

Sourcetree.PNG ‏6 KB

[Balazs Szakmary · Accepted solution]

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

[Hui Zhao]

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

[Balazs Szakmary]

Edited the answer to match the picture.

[Tim Crall]

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