A git parent-child architecture

  1. Run this in the git repository
git config --global merge.ours.driver true

--

--

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store