I don't normally use git pull myself rebase or otherwise. What I do often on my feature branch is git rebase origin/master (or whatever the shared development branch is) to make sure I am working on the correct level of code. Last one in is the one responsible for making sure code works with existing.
It would be helpful to note that the branches are generally short lived and not super all encompassing in code changes usually.
I don't normally use
git pullmyself rebase or otherwise. What I do often on my feature branch is git rebase origin/master (or whatever the shared development branch is) to make sure I am working on the correct level of code. Last one in is the one responsible for making sure code works with existing.It would be helpful to note that the branches are generally short lived and not super all encompassing in code changes usually.