Skip to content

Instantly share code, notes, and snippets.

@galak-fyyar
Created October 19, 2011 12:49
Show Gist options
  • Save galak-fyyar/1298196 to your computer and use it in GitHub Desktop.
Save galak-fyyar/1298196 to your computer and use it in GitHub Desktop.
Conflicts in Git
git checkout -b experiment
git init .
touch Main.java
touch Fibonacci.java
git add *.java
git commit -m "Initial commit"
git merge -Xpatience experiment
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment