• 0 Posts
  • 5 Comments
Joined 1 year ago
cake
Cake day: June 5th, 2023

help-circle

  • Apparently git let’s you push two completely independent histories into one repo if you force push and will happily let you go about your business until you try to merge.

    I found this out when an intern copied the code, initiated a new repo, worked off that repo, force pushed into remote, kept working on his branches. Absolutely not his fault, he should have had help. But I had to edit history and rewrite the parent of a commit to unite the family lines!

    Fun to learn that you can create that problem and also there’s a “way” to fix it.



  • I understand why others are taking issue on your asking for free services. Maybe it could have been phrased better but not everyone has the life circumstances to pay for privacy respecting services, that’s why I do like the freemium/donation models so those who are able can subsidize those who can’t. Hopefully when circumstances improve more people can “pay it forward”.

    Here are my recommendations:

    • Mail / Calendar / VPN / Drive: Proton free tier - 1GB shared storage and 1 VPN connection
    • Chat / Messaging: Signal
    • Community / Discord alternative: Matrix