home.social

#theirs — Public Fediverse posts

Live and recent posts from across the Fediverse tagged #theirs, aggregated by home.social.

  1. git mindfuck of the day:

    • While merging branch B into branch A, A is “ours”, B is “theirs” (changes from B are reflected in A)

    • When rebasing branch B on top of branch A, A is ”ours”, B is “theirs” (changes from A are reflected in B)

    nitaym.github.io/ourstheirs/

    #git #merge #rebase #ours #theirs #dev