[testcase notes] #31: Conflict, default commit messages

[dorawyy]

1. git merge conflict

Way1: Default merge

After resolving the conflict, if git commit directly without attaching -m and customized commit message, then go to the default commit message page

git merge Branch

# conflict show up
# after resolving conflict, continue merge

git add file_with_conflict
git commit 

The default message for the merge commit is:

Conclusion:

• The conflict message is included in the commit message but commented out by default.
• Default message will mention this is a merge commit
• In the following, we will see this is the same as Way2 (with --no-commit param)

Way2: --no-commit (same as default merge)

When merging, use --no-commit param:

git merge Branch --no-commit

# conflict show up
# after resolving conflict, continue merge

git add file_with_conflict
git commit 

Conclusion:

• The conflict message is included in the commit message but commented out by default.
• Default message will mention this is a merge commit
• same as default merge (way1)

Way3: --squash

When merging, use --squash param:

git merge Branch --squash

# conflict show up
# after resolving conflict, continue merge

git add file_with_conflict
git commit 

Conclusion:

• The conflict message is included in the commit message but commented out by default.
• No indication says this commit is from a merge process

[dorawyy]

2. git rebase conflict

default rebase

git checkout TestC
git rebase TestD

The first conflict during rebase

This is the conflict file:

Resolved as:

Current status:

Then continue rebase, and the rebase is done:

The project history becomes:

No hint at all.

Conclusion:

• No indication for rebase itself
• No indication for conflicts during rebasing

[dorawyy]

3. git revert conflict

Way1: Default revert

git revert head^

# conflict
# resolve conflict, then continue revert

git add file_with_conflict
git revert --continue

Conclusion:

• By default, have revert keyword in the default commit message
• By default, conflict message is commented in the default commit message

Way2: --no-commit when reverting

git revert head^ --no-commit

# conflict
# resolve conflict

git add file_with_conflict
git revert --continue

Conclusion:

• By default, have revert keyword in the default commit message
• By default, conflict message is commented in the default commit message
• Same as default revert

[dorawyy]

4. pull request conflict

4.1 Original state of the pull request:

4.2 Have to resolve conflict before merging the pull request

4.2.1 Merge to resolve conflict (on head fork repo)


4.2.1.1 Way1: Github online editor (on head fork repo)

Here is the default commit message of the merge conflict resolved with Github online editor:

Conclusion:

• Can see it is a merge;
• No indication for Conflict

4.2.1.2 Way2: Local machine resolution (on head fork repo)

Go to head_fork repo (aka. pull request repo) --> dorawyy in this case

git checkout Feature1
git pull Upstream_repo_url Feature1

# would meet conflict here, resolve the conflict
# continue merge

git add conflict_file
git commit

Conflict:

Conflict-resolved version:

By default, conflict info is included in commit message

Conclusion:

• The conflict message is included in the commit message but commented out by default.
• Default message will mention this is a merge commit

4.2.2 Rebase to resolve conflict(on head fork repo) (git pull --rebase)

# go to head fork repo

git checkout Feature1
git pull upstream_repo Feature1 --rebase

# rebase conflict
# resolve rebase conflict

git add conflict_file
git rebase --continue

4.3 No conflict when merging the pull request

4.3.1 Merge

Merge conflict is already resolved

4.3.2 Squash

Merge conflict is already resolved

4.3.3 Rebase

This option will be disabled if having potential conflicts