Aral Balkan on Nostr: git mindfuck of the day: While merging branch B into branch A, A is “ours”, B is ...

git mindfuck of the day:

While merging branch B into branch A, A is “ours”, B is “theres” (changes from B are reflected in A)
When rebasing branch B on top of branch A, A is ”ours”, B is “theres” (changes from A are reflected in B)

https://nitaym.github.io/ourstheirs/

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