Confirmed users
1,643
edits
Cjku/git: Difference between revisions
Jump to navigation
Jump to search
→checkout abort
| Line 400: | Line 400: | ||
Switched to branch 'new_branch' | Switched to branch 'new_branch' | ||
What is so called "conflict"? | What is so called "conflict"? There are three factors impact logic of "conflict test" | ||
Factor A: the file exists in the new branch | Factor A: the file, you change/ add/ remove, exists in the new branch | ||
Factor B: the file, you change/ add/ remove, is the same in two branches | |||
Factor B: the file is the same in two branches | Factor C: whether you change the change | ||
Factor C: | |||
# Modify a file: | # Modify a file: | ||