Regarding rebasing branches...

[justin808]

https://github.com/thoughtbot/guides/blob/master/protocol/git/README.md

git fetch origin
git rebase -i origin/master

Sometimes, small teams will work on a branch, but typically on different files within that branch.

Possibly the advice on rebasing should explain the pitfalls of doing the above rebase without coordinating with other branch users.

[justin808]

@mjankowski Do you have guidelines for multiple collabs on a branch?

[mjankowski]

Talk to each other.