nav[aria-label="Primary Navigation"] { padding: 0; & ul { list-style: none; width: 100%; display: flex; flex-direction: row; justify-content: start; align-items: start; gap: 30px; padding: 0; & li { margin: 0; } & ul li { list-style: none; } } }

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

Accepted answers

Balázs Szakmáry

Pull
(resolve merge conflicts, if any)
Push

All comments

Balázs Szakmáry

Pull
(resolve merge conflicts, if any)
Push

Hui Zhao

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

Balázs Szakmáry

Edited the answer to match the picture.

Tim Crall1

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

Welcome!

It looks like you're new here. Sign in or register to get started.

Quick Links

Find more posts tagged with

sourcetree