Skip to content

Instantly share code, notes, and snippets.

@Carmer

Carmer/git-issues

Last active August 29, 2015 14:19
Show Gist options
  • Star 0 You must be signed in to star a gist
  • Fork 0 You must be signed in to fork a gist
  • Save Carmer/6eac821fece62e9f71db to your computer and use it in GitHub Desktop.
Save Carmer/6eac821fece62e9f71db to your computer and use it in GitHub Desktop.
Download ZIP
Raw
git-issues
merge conflicts from traffic spy:
https://github.com/Carmer/traffic-spy-skeleton/commit/0bfe5bea4d6bdd516c2522f6dae44bcd4655296a
seem to be caused because the same file with pushed with different or contradictory code. Sometimes the only difference is a space, or a commented out method
The project slowed a bit at the times we had these issues, but we would contact eachother, resolve the conflict then move on.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment