▲ 933 ▼ In case of fire (lemmy.world) submitted 2 years ago by SeeMinusMinus@lemmy.world to c/programmerhumor@lemmy.ml 73 comments fedilink hide all child comments
[–] evilgiraffe666@ttrpg.network 6 points 2 years ago (1 child) On a push? What are you merging there? permalink fedilink source parent hideshow 2 child comments replies: [–] fushuan@lemm.ee 4 points 2 years ago (1 child) Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew) permalink fedilink source parent hideshow 2 child comments replies: [–] evilgiraffe666@ttrpg.network 8 points 2 years ago Right, on shared branch you might need to pull first if you're out of date (and you would be if you're all leaving the office at the same time), and that could cause a merge conflict. It's like I always said, bad branching strategies are a fire safety issue. permalink fedilink source parent
[–] fushuan@lemm.ee 4 points 2 years ago (1 child) Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew) permalink fedilink source parent hideshow 2 child comments replies: [–] evilgiraffe666@ttrpg.network 8 points 2 years ago Right, on shared branch you might need to pull first if you're out of date (and you would be if you're all leaving the office at the same time), and that could cause a merge conflict. It's like I always said, bad branching strategies are a fire safety issue. permalink fedilink source parent
[–] evilgiraffe666@ttrpg.network 8 points 2 years ago Right, on shared branch you might need to pull first if you're out of date (and you would be if you're all leaving the office at the same time), and that could cause a merge conflict. It's like I always said, bad branching strategies are a fire safety issue. permalink fedilink source parent
