Skip to content

Merge conflicts!

Hugh Vidler edited this page Mar 24, 2018 · 4 revisions

We'll inevitably run into some merge conflicts when we git rebase ... Don't freak out!

Some background on merges

Wait... what is rebasing!?

These should demystify how we integrate our code with the rest of our teams and vice versa.

Clone this wiki locally