search

HackYourFuture-CPH / FP-class11

Class11 Final Project - A collaboration between HYF and Seasony
MIT License
5 stars 8 forks source link

update git documentation #160

Closed senner008 closed 4 years ago

senner008 commented 4 years ago

This adds instructions on how to simulate a merge

senner007 commented 4 years ago

Hmm... I'm having second thoughts about this... Maybe better to find a way to simply diff the conflicts