DEV Community

loading...

Discussion on: 🌳🚀 CS Visualized: Useful Git Commands

Collapse
chiragshahklc profile image
Chirag Shah

I have one question.
For example, I am working on the dev branch. Meanwhile, my colleague has pushed 2 more commits.
What should I do? Should I pull first then commit or should I commit first and then pull?
I am always confused over here.

Collapse
thamaraiselvam profile image
Thamaraiselvam • Edited

You cannot pull before commit because git does not know what do with changes in local.

This is what we do.

  • commit local changes
  • git pull --rebase (This will copy commits to top. without rebase commits be will merged)
  • git push

if you dont want to commit ur changes and still you want to pull data you do stash

stash will push changes to stack and you can get it from it later or you can auto stash

git pull --rebase --auto-stash

Collapse
chiragshahklc profile image
Chirag Shah

Thank you so much for the answer. Very Helpful!