i need to merge like five million mastodon commits into chitter like three weeks ago and i dont want tooooooo wauuuuuh

i dont understand why the git experience of making a few small patches to a codebase and then repeatedly merging changes from upstream is so miserable. every time i have to manual merge dozens and dozens of files that i've never touched. i feel like i'm doing it wrong but every time i complain about it and no one has gone "it is because you are doing it wrong"

Follow

@codl I've been rebasing my changes on top of mainline (well, I'm way behind but y'know), you have to rewrite history every time but it's way easier to check what was actually changed

Sign in to participate in the conversation
Awoo Space

Awoo.space is a Mastodon instance where members can rely on a team of moderators to help resolve conflict, and limits federation with other instances using a specific access list to minimize abuse.

While mature content is allowed here, we strongly believe in being able to choose to engage with content on your own terms, so please make sure to put mature and potentially sensitive content behind the CW feature with enough description that people know what it's about.

Before signing up, please read our community guidelines. While it's a very broad swath of topics it covers, please do your best! We believe that as long as you're putting forth genuine effort to limit harm you might cause – even if you haven't read the document – you'll be okay!