• 1 Post
  • 34 Comments
Joined 3 years ago
cake
Cake day: October 3rd, 2021

help-circle
  • Rebasing is for advanced git users who knows what he’s doing. If one does not know how to use it or not feeling comfortable in general, he can happily take his own code and try to merge it into the latest version instead. No one is judging.

    For the rest of the world where projects are open-source, more often than not, not those projects inside a corporation where only the team lead is making decisions, it’s a powerful tool to settle down conflicts sort out history.

    One does not need to change the history again, if he’s not comfortable with it. Just use git as if it’s centralised VCS like SVN. No big deal. In fact, in corporations you do. There only needs to be one person who manages the repository.




  • I know, right? The pronoun for third-person female did not exist historically. When western culture hit China 100 years ago, they swap out the part where it means ‘human’ to make a new word.

    Now when someone wants to refer to one in a gender-neutral way, they naturally write out the phonetic ‘ta’, as if the gender-neutral word is for male only.🤦

    Same goes for second-person pronoun in Taiwan.

    Stop these bullshits! The Chinese language does not need to address the gender! Figure that out in context! If you are writing and don’t want to confuse your reader, just use the name!