[testcase notes] #6 (aka 5): merge Feature1 branch to Master branch (only Feature1 has new commits)

[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 Feature1 branch, edited test5 file, add, commit;
• on master branch, no change, no commit;
• checkout master branch, merge Feature1 branch;
• what would happen about merging?
• (after local testing, push all changes back to remote repo)

Results:

• fast-forward merging, no extra commit created, just moving the head pointer

Data could be explored:

• no history to retrieve ( as no extra commit)

Detailed steps

step0: start point of the test case:

• created the file test5 on master branch
  • git checkout master
  • touch test5
  • edit test5
• git branch Feature1 preparation done.

Creating branch and checking out Feature1, it also has the file test5, the version is the same as master branch.

Startpoint preparation finished.

The master branch head and Feature1 branch point to the same commit, and the project log looks 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: Feature1 branch: edited file test5, committed

• checking out Feature1 branch

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

  

• edit the file test5

• git add, git commit, no push yet

## making sure working on Feature1 branch
git branch 
git add test5
git commit -m "Feature1: edited the file test5"

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

Step3: master branch: no change

do nothing in this step

Step4: checking out master branch, merge Feature1 branch back

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

As we can see, before merging, Feature1 branch is 1 commit ahead master branch:

When the developer merge, it is a fast-forward merging, and the master branch head move 1 commit forward, pointing to the same commit as Feature1 branch:

Step5: Looking into details about the commits happened during the whole test

• the start point commit

• the edit-test5-commit (did when checking out Feature1 branch)

• Merging --> no commit or history recorded about merging

Step6: history in github before vs. after git push origin master

For now, the developer hasn't pushed the test5 edit commit to remote repo, the latest commit on Github is:

--> master branch:

--> Feature1 branch: ( no Feature1 branch on remote repo yet because the developer hasn't set up it to be remote-tracking one )

Now, if the developer git push commits to master branch to the remote repo: The two commits will show up on github - master branch

However, the branch Feature1 is still not on github

Step7: setup remote-tracking, git push origin Feature1

• 1, checking-out Feature1 branch

git checkout Feature1
git branch

• 2, list all braches (local & remote-tracking ones)

git branch -a 

As we can see, there is no remote-tracking branch of Feature1

• 3, set up remote-tracking branch, and push all changes to remote

# git checkout Feature1
git push origin Feature1
git branch -a

• 4, when checking history, we can see one more remote-tracking branch here:

• 5, check github about Feature1 branch

As we can see now, there is a Feature1 branch on github

When looking into changes of Feature1 branch:

it has all the new commits in this test case, also all history commits of its parent branch -- master branch.

Conclusion: no history/data recorded for this case, nothing to exploit