Confirmed users
1,643
edits
Cjku/git: Difference between revisions
→checkout abort
| Line 386: | Line 386: | ||
In certain circumstances, git-checkout aborts: | In certain circumstances, git-checkout aborts: | ||
# Modify a file, which exists in both origin and new tree, without commit change into tree. | # (Aborting) Modify a file, which exists in both origin and new tree, without commit change into tree. | ||
# Remove a file, which exists in both origin and new tree, in working directory and the index, and does not commit this change into tree. | # (Aborting) Remove a file, which exists in both origin and new tree, in working directory and the index(by git-rm command), and does not commit this change into tree. | ||
# If you know any cases that I miss, please append it here. | # If you know any cases that I miss, please append it here. | ||