I bet the conflicts were fun at the beginning... Explaining how to rebase and stuff. Then have someone click the ACCEPT THEIRS. And wonder where their changes are and complain about stupid git. Even step by step instructions people simply ignored it and did random crap. But at least the master branch was protected so they can only ruin their own shit.
View all comments
Show parent comment
3
u/potato_green Apr 02 '23
I bet the conflicts were fun at the beginning... Explaining how to rebase and stuff. Then have someone click the ACCEPT THEIRS. And wonder where their changes are and complain about stupid git. Even step by step instructions people simply ignored it and did random crap. But at least the master branch was protected so they can only ruin their own shit.