3 ms·
If a merge conflict occurs, I'd much rather hear about it from git instead as opposed to some obscure breakage later in testing or production.
by usefulcat 5y ago
If a merge conflict occurs, I'd much rather hear about it from git instead as opposed to some obscure breakage later in testing or production.
- Gigachad 5y agoThe merge conflicts tend to be things like library updates or large scale refactors. It's massively easier to update a core framework 20 times than it is to do it once on a repo 20x larger due to merge conflicts and the minimum possible work being 20x larger.