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

Pull
(resolve merge conflicts, if any)
Push

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Edited the answer to match the picture.

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

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

You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.

Comment

Suggest an answer

Sourcetree

Products

Interests

Groups

Community resources

Support

A basic question for push and pull

1 answer

1 accepted

Suggest an answer

Brian Ganninger

Tip from the team: configure your repos for hosting goodness!

Atlassian User Groups

Find my local user group

Groups near you

Ask a question

Start a discussion

Products

Interests

Groups

Community resources

Support

A basic question for push and pull

1 answer

1 accepted

Suggest an answer

Brian Ganninger

Tip from the team: configure your repos for hosting goodness!

Atlassian User Groups

Find my local user group

Groups near you