meghansharris,
@meghansharris@fosstodon.org avatar

When you're trying to make git merge conflicts ON PURPOSE and the conflicts ain't conflicting

The confused Travolta meme from the movie Pulp Fiction

maelle,
@maelle@mastodon.social avatar

@meghansharris this is why the example in https://maelle.github.io/saperlipopette/reference/exo_conflict.html is so bad, SO hard to create those on purpose 😂

meghansharris,
@meghansharris@fosstodon.org avatar

@maelle I’m not even judging because I honestly could not believe after all the times I’ve seen them, it took me so long to get just ONE 😭😂😂

  • All
  • Subscribed
  • Moderated
  • Favorites
  • •
  • random
  • osvaldo12
  • DreamBathrooms
  • InstantRegret
  • magazineikmin
  • Durango
  • Leos
  • Youngstown
  • thenastyranch
  • slotface
  • rosin
  • kavyap
  • mdbf
  • cubers
  • ethstaker
  • anitta
  • khanakhh
  • tacticalgear
  • provamag3
  • ngwrru68w68
  • everett
  • GTA5RPClips
  • modclub
  • normalnudes
  • megavids
  • cisconetworking
  • tester
  • JUstTest
  • lostlight
  • All magazines
    •