4 ms·Sooooooo >git merge --strategy-option=theirsby kadenshep 9y agoSooooooo >git merge --strategy-option=theirs