a solid, non-jerkass use of git push --force feels pretty good tbh

@monorail gosh, when i first discovered git rebase -i

@monorail saaaame

i mean, i know how to amend the last commit, but anything before that is just always gonna be rebase -i for me

i'm happy how surprisingly user-friendly it is, considering what it's doing--especially if you have a good three-way merge tool set up ^^

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!