cm0002@lemdro.id to

Programmer Humor@programming.devEnglish · 2 months ago

When you screw up git

795

When you screw up git

cm0002@lemdro.id to

Programmer Humor@programming.devEnglish · 2 months ago

Chat

mere@lemmy.blahaj.zone
link
fedilink
arrow-up
4·
2 months ago
it’s fine for simple merge conflicts but it quickly gets messy when the two branches are trying to do opposite things to the same code
- tomjuggler@lemmy.world
  link
  fedilink
  arrow-up
  2·
  2 months ago
  Or 3 branches…
- dream_weasel@sh.itjust.works
  link
  fedilink
  arrow-up
  1·
  2 months ago
  Sounds like agreement and resolution are required pre merge conflict resolve.

Programmer Humor@programming.dev

programmer_humor@programming.dev

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: !programmer_humor@programming.dev

Welcome to Programmer Humor!

This is a place where you can post jokes, memes, humor, etc. related to programming!

For sharing awful code theres also Programming Horror.

Rules

Keep content in english
No advertisements
Posts must be related to programming or programmer topics

Visibility: Public

This community can be federated to other instances and be posted/commented in by their users.

47 users / day
4.34K users / week
8.84K users / month
18K users / 6 months
2 local subscribers
27.8K subscribers
1.84K Posts
64.3K Comments
Modlog