The biggest lie you were ever told is that the world needs CEOs or presidents or whatnot. That some privileged clueless asshat – and it’s usually a guy – needs to make the “hard decisions” that the everyday people who keep things running and actually know shit are apparently incapable of making just because they might just make them in ways that benefit their communities and humanity at large instead of playing some psychopathic and self-destructive zero sum game with all our futures. Fuck ‘em. Fuck the lot of ‘em. Oh, you’re a “leader” are you? Fuck you. The world doesn’t need you or your toxic bullshit. You’re worse than useless.
So, just to confirm: you have Projects A that’s, say, on Computer X and Y. In GitHub/Codeberg/etc., you have a remote R.
You makes changes to A on X and push your main branch to R. You go on Y and pull from R; your main branch updates.
If you’re not on main, you might see prompts to create a pull request from the latest push to a feature branch. That’s nothing to worry about and you can ignore it. It should go away when you merge that feature branch into main.
I recently had to make a phonecall to tell a relative that while she was invited to my wedding her husband was not, because not only did he harm people with what he said his entire job involves working to harm people and actively bringing about the current state of the world. And that was honestly the hardest phonecall I've every had to make in my life, up there with phoning my brother to tell him my aunt had died.
Thinking about this excellent thread https://helvede.net/@jwcph/114029855409119327 and why it's so hard to challenge racist family members, because honestly this is a problem I've had - I find it far easier to challenge strangers, colleagues and friends than I do family, and I wonder if some musings on why would help other people who are the same.
@nopatience@oliver PS. You’re getting PRs? Is this on GitHub? Are you sure you’re not just working on a branch and, when you push updates to it, GitHub is asking you if you want to create a PR? (Codeberg, which I use, does that at least; don’t remember if GitHub did, it’s been a while.)
(Git has no concept of PRs. That’s a GitHub/git host construct.)
@nopatience@oliver Can highly recommend using Sublime Merge. I’m perfectly comfortable with regular git use via terminal and have been for yonks but Sublime Merge has its own monitor while I’m working and I get instant diffs. And it’s great for making focussed commits (just this hunk or just these lines) and for daily time travel (e.g., let’s go back to this commit and treat changes since as staged, etc.)
@jwcph To take this further, I wonder how much of the acceptance of the “racist family member” is the fear that were they to confront the worst embodiments of an unfair and unjust system they benefit from themselves, the whole thread might unravel, threatening their own place of privilege within such a society.
In other words, how much of it is the implicit, guilty understanding that they are, themselves, fainter echos of said family member; at once disgusted by what they see in the mirror and yet terrified of the consequences of shattering it?
Social oncologist. I make small things.Unapologetically anti-genocide.My posts are licensed under Creative Commons Attribution-NonCommercial-ShareAlike (https://creativecommons.org/licenses/by-nc-sa/4.0/)🍉🌻 🏳️🌈 🏳️⚧️#SmallWeb #SmallTech #web #tech #privacy #humanRights #personhood #democracy #aral #fedi22 #searchable