3 ms·sure, but solving conflicts is still hard in git. This can be simplified.by feelamee 6mo agosure, but solving conflicts is still hard in git. This can be simplified.