Skip to content

Instantly share code, notes, and snippets.

@sigma

sigma/gist:5477827

Last active June 27, 2017 05:43
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 sigma/5477827 to your computer and use it in GitHub Desktop.
Save sigma/5477827 to your computer and use it in GitHub Desktop.
Download ZIP
#git weirdness
Raw
gistfile1.txt
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:09:%)─[master]── git merge --no-ff sergv/master ──(Sun,Apr28)─┘
Merge made by the 'recursive' strategy.
magit-key-mode.el | 1 +
magit.el | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
tests/magit-tests.el | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 97 insertions(+), 10 deletions(-)
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:10:%)─[master]── git co next ──(Sun,Apr28)─┘
Switched to branch 'next'
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── git merge master ──(Sun,Apr28)─┘
error: Your local changes to the following files would be overwritten by merge:
magit.el
Please, commit your changes or stash them before you can merge.
Aborting
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── git st ──128:(Sun,Apr28)─┘
# On branch next
nothing to commit, working directory clean
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── ──(Sun,Apr28)─┘
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── ──(Sun,Apr28)─┘
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── git merge master ──(Sun,Apr28)─┘
error: Your local changes to the following files would be overwritten by merge:
magit.el
Please, commit your changes or stash them before you can merge.
Aborting
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── touch magit.el ──128:(Sun,Apr28)─┘
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── git merge master ──(Sun,Apr28)─┘
error: Your local changes to the following files would be overwritten by merge:
magit.el
Please, commit your changes or stash them before you can merge.
Aborting
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── git diff ──128:(Sun,Apr28)─┘
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:11:%)─[next]── git st ──(Sun,Apr28)─┘
# On branch next
nothing to commit, working directory clean
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:12:%)─[next]── git merge master ──(Sun,Apr28)─┘
Auto-merging magit.el
Auto-merging magit-key-mode.el
Merge made by the 'recursive' strategy.
magit-key-mode.el | 1 +
magit.el | 50 +++++++++++++++++++++++++++++++++++++++++++++-----
tests/magit-tests.el | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++-----
3 files changed, 97 insertions(+), 10 deletions(-)
Raw
gistfile2.txt
# output of git diff-files when this happens:
┌─(yann@jarvis)─[env:default]───────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────────(~magit)─┐
└─(19:33:%)─[next]── git diff-files ──(Sun,Apr28)─┘
:100644 100644 bd774cccaa14e061c3c26996567ee28f4f77ec80 0000000000000000000000000000000000000000 M magit.el
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment