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.
You cannot pull before commit because git does not know what do with changes in local.
This is what we do.
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
Thank you so much for the answer. Very Helpful!
Are you sure you want to hide this comment? It will become hidden in your post, but will still be visible via the comment's permalink.
Hide child comments as well
Confirm
For further actions, you may consider blocking this person and/or reporting abuse
We're a place where coders share, stay up-to-date and grow their careers.
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.
You cannot pull before commit because git does not know what do with changes in local.
This is what we do.
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
Thank you so much for the answer. Very Helpful!