Confirmed users
1,643
edits
Cjku/git: Difference between revisions
Jump to navigation
Jump to search
→checkout abort
| Line 409: | Line 409: | ||
Switched to branch 'new_branch' | Switched to branch 'new_branch' | ||
What is so called "conflict"? There are three factors, at least, | What is so called "conflict"? There are three factors, at least, define the logic of "conflict test" | ||
Factor A: the file, you change/ add/ remove, exists in the new branch | Factor A: the file, you change/ add/ remove, exists in the new branch | ||