We read every piece of feedback, and take your input very seriously.
To see all available qualifiers, see our documentation.
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
ms1
ms2
(content of test24-content-conflict)
test24-content-conflict
(content of test24-delete-modify-conflict)
test24-delete-modify-conflict
(content of test24-ms1 and test24-ms2)
test24-ms1
test24-ms2
The text was updated successfully, but these errors were encountered:
git checkout ms1 # edit file test24-content-conflict, line 2 git add test24-content-conflict git commit -m "ms1: edit file test24-content-conflict, line2"
(ms1 edit file test24-content-conflict, line 2) (the project status becomes:)
git checkout ms2 # edit file test24-content-conflict, line 2 git add test24-content-conflict git commit -m "ms2: edit file test24-content-conflict, line2"
(ms2 edit file test24-content-conflict, line 2)
(the project status becomes:)
resolve
git checkout ms2 git merge ms1 -s resolve
git add test24-content-conflict git commit # then, auto commit message created for the merge
git checkout ms2 git reset --hard head~
recursive
octopus
ours
subtree
Sorry, something went wrong.
No branches or pull requests
Sumamry:
Branches used in the series of tests:
Files used in the series of tests:
Preparation
ms1
andms2
(content of
test24-content-conflict
)(content of
test24-delete-modify-conflict
)(content of
test24-ms1
andtest24-ms2
)references
The text was updated successfully, but these errors were encountered: