[testcase notes] #8: merge Feature1 branch to Master branch (both commits, diff files)

[dorawyy]

Cloned the repo, work on two branches

Scenario abstraction

• developer1 worked on two branches (Feature1 branch and master branch of the repo) (Feature1 branch was derived from master branch):
• developer1 cloned the remote repo, and fetched the two remote-tracking branch locally:
  • --> master branch
  • --> Feature1 branch
• on master branch, edited test8-1 file, add, commit;
• on Feature1 branch, edited test8-2 file, add, commit;
• checkout master branch, merge Feature1 branch;
• what would happen about merging?
• (after local testing, push all changes back to remote repo)

Results:

• no conflict, three-way merging with an extra merge commit

Data could be explored:

• a merge commit is created, and its parent commits can be retrieved.

Detailed steps

step0: start point of the test case:

• created the file test8-1 and test8-2 on both branches -- master and Feature1 branch
  • git checkout master
  • touch test8-1
  • edit test8
  • touch test8-2
  • edit test8-2
  • git add, git commit, git push origin master -- both test8-1 and test8-2
• git checkout Feature1
  • git merge master
  • git push origin Feature1

(sync the two branches, both local and remote-tracking ones) Preparation done.

The edit is: --> test8-1

--> test8-2

When the preparation is done, the history is like:

Step1: cloned the repo ( already did in testcase #1 )

git clone https://github.com/dorawyy/git-merge-conflicts-test.git git-merge-conflicts-test-1

To make it short, we call them:

• repo1

Step2: master branch: edited file test8-1, committed

• checking out master branch

  git checkout master
  # make sure current checking-out branch is master
  git branch

  

• only edit the file test8-1 (on master branch)

  

• git add, git commit, no push yet (on master branch)

## making sure working on master branch
git branch 
git add test8-1
git commit -m "master: edited the file test8-1"

The project history in EGit becomes like (master's head moved forward, 1 commit ahead Feature1 branch ):

Step3: Feature1 branch: edited test8-2 file, add, commit;

# checkout Feature1 branch
git checkout Feature1
git branch

• Only edit test8-2

  

• git add, git commit, no push yet (on Feature1 branch)

  git branch
  git add test8-2
  git commit -m "Feature1: edited the file test8-2"

  

• Then the log history becomes:

  

Step4: checking out master branch, merge Feature1 branch back

• before merging, the project history is like:

• merge master branch with Feature1 branch

# make sure on master branch
git checkout master
git branch
# merge
git merge Feature1

• When merging, a merge commit comes up, though no conflicts here. A three-way merging is done, with an extra merge commit.

• now, the project log becomes:

As the developer can see, master head moved 1 commit forward, which is a merge commit

Step5: move Feature1 branch forward --> merge

• checkout Feature1 branch

git checkout Feature1
git branch

• merge Feature1 branch with master branch

# should be in Feature1 branch
git branch
git merge master

then the history becomes:

Feature1 head move 1 commit forward, the same as master branch

Step6: push all changes back to remote repo

• push master commits to origin/master

git checkout master
git branch
git push origin master

Here is the project log. As the developer can see, the head and origin/master moves forward to the latest commit. however, origin/Feature1 stayed still.

• push Feature1 commit to origin/Feature1 branch

git checkout Feature1
git branch
git push origin Feature1

Here is the current history log. Now, everything synced to the latest commit.

• check git log from both master and Feature1 branch

--> master branch

--> Feature1 branch

Conclusion:

• If there are both commits in the two branches the developers would like to merge, it will be a three-way merging and an extra merge commit will be created.