Re:Resolve simple merge conflicts on GitHub
by sjrd on Tuesday December 13, 2016 @08:18AM
(#13166520)
Or much simpler: do not allow merge conflicts to happen in the first place! Any Pull Request that shows with merge conflicts must be rebased on top of the target branch. Problem solved.
[ Parent
| on HN ]
There are no comments on this comment yet.