rem’s avatarrem’s Twitter Archive—№ 65,864

  1. …in reply to @simonw
    simonw amihaiemil Didn't fly. Landed me a load of merge conflicts (Where names were re-used across the branches). This had more juice: git merge --allow-unrelated-histories -X theirs THATBRANCH - just one conflict to handle.
    On twitter.com Twitter logo rem’s avatar ❤️ 4 Favorites Mood -4 🙁