So there is a 50/50 chance I am getting flamed af tomorrow during code review because of my branching/merging actions on thursday and friday... Merge conflicts... We all love them...

You learn once, well.. then you learn once

As I always say, you don't learn if everything runs the first time...

Errors === Learning Opportunities

No one can be blamed for merge conflicts, those are part of the necessary flow. Although, if you reverted changes made by others it's just a learning path. That's part of the reason we use version controls in the first place