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.
You are not logged in. However you can subscribe from another Fediverse account, for example Lemmy or Mastodon. To do this, paste the following into the search field of your instance: !programmerhumor@lemmy.ml
Post funny things about programming here! (Or just rant about your favourite programming language.)
Rules:
Posts must be relevant to programming, programmers, or computer science.
No NSFW content.
Jokes must be in good taste. No hate speech, bigotry, etc.
On a push? What are you merging there?
Ofc, you might be working directly on develop/master/shared branch, I know people that work in those environments (ew)
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.