Closed senner008 closed 4 years ago
This adds instructions on how to simulate a merge
Hmm... I'm having second thoughts about this... Maybe better to find a way to simply diff the conflicts
This adds instructions on how to simulate a merge