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)

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

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

Harvey Keitel, Rita Moreno, Roselyn Sanchez & Udo Kier Board Indie Horror Thriller ‘Theirs’
#Casting #HarveyKeitel #PriceProductions #RitaMoreno #RoselynSanchez #SonjaO039Hara #Theirs #UdoKier

https://deadline.com/2024/02/harvey-keitel-rita-moreno-to-star-horror-thriller-theirs-1235824243/