Successfully resolved my first merge conflict WITHOUT destroying the whole project.
#eleventh-time-lucky

What kind of project was it?

@matsaki95 hmm sounds familiar.... Oh no that wasn't a hint, don't worry 😜

@Arctic An angular app on which three people were working on right now, and two seasons of interns have worked on before.
For the three of us, one component works for a specific person but breaks down for the other, even after rebasing the shit out of the repo.