3 ms·
IMO, it is unnecessary to commit the conflicts. Instead, you can see how merges were resolved by diffing the commits.
by chrisamanse 10y ago
IMO, it is unnecessary to commit the conflicts. Instead, you can see how merges were resolved by diffing the commits.
- pkamb 10y ago"Diffing the commits" isn't really available in in a GitHub-style Pull Request web UI, which is where 99% of our code review is happening. I'm definitely optimizing for that view of the merge over everything else.
- squidbidness 10y agoI love how github fosters discovery and remote collaboration, though one of its liabilities is when great git command-line features are effectively lost unless github re-implements or exposes them, because some conventions incentivize only doing what github itself can do.