So since my attempt to switch branches with the "merge" flag (-m) gave me an
error, I thought I'd try to go back.
keybounceMBP:Finite-Fluids michael$ git merge --abort
fatal: There is no merge to abort (MERGE_HEAD missing).
keybounceMBP:Finite-Fluids michael$ git status
On branch cleanup
Unmerged paths:
(use "git reset HEAD <file>..." to unstage)
(use "git add <file>..." to mark resolution)
both modified:
src/main/java/com/mcfht/realisticfluids/fluids/BlockFiniteFluid.java
Changes not staged for commit:
(use "git add <file>..." to update what will be committed)
(use "git checkout -- <file>..." to discard changes in working directory)
modified: src/main/java/com/mcfht/realisticfluids/FluidData.java
modified:
src/main/java/com/mcfht/realisticfluids/commands/CommandEnableFlow.java
modified:
src/main/java/com/mcfht/realisticfluids/fluids/BlockFiniteLava.java
no changes added to commit (use "git add" and/or "git commit -a")
I'm not saying this is necessarily wrong (the other branch does have
everything, and I'm on a branch where I could just commit all these changes
now, and worry about fixing it later; no data would be lost), but I do think
that it breaks the user's reasonable beliefs about what the system does --
including the ability of a version control system to roll back to a prior state
(which in this case it cannot -- or if it can, I don't know how.)
---
Entertaining minecraft videos
http://YouTube.com/keybounce
--
You received this message because you are subscribed to the Google Groups "Git
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.
