Re:Resolve simple merge conflicts on GitHub
by chrisamanse on Monday December 12, 2016 @05:16PM
(#13162498)
IMO, it is unnecessary to commit the conflicts. Instead, you can see how merges were resolved by diffing the commits.
[ Parent
| on HN ]
Re:Resolve simple merge conflicts on GitHub
by pkamb on Monday December 12, 2016 @05:21PM
(#13162537)
"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.
Re:Resolve simple merge conflicts on GitHub
by squidbidness on Monday December 12, 2016 @08:05PM
(#13163640)
I 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.