Github's UI Based Conflict Resolution Can Cause Problems

This site does not allow itself to be embedded. You can still read it on the original site — the toolbar below keeps your place in the directory.

Github's UI Based Conflict Resolution Can Cause Problems When using the Github web-based conflict resolution, a user can mistakenly have branches merged that they did not intend to merge. Because the mistake occurs on the source-of-truth copy of the repository, a user does not have a chance to correct the issue before other team members could pull the errant branch. Github's live editing…

Read on jamesonnetworks.com ↗