search

dorawyy / git-merge-conflicts-test

This repo is for testing of git functionalities / different merging conflict scenarios, and CI tools usage
2 stars 4 forks source link

[testcase notes] #30: git rebase test cases scratches #76

Open dorawyy opened 6 years ago

dorawyy commented 6 years ago

git rebase testcases

Intro of git rebase options --> #66

Testcase1: Rebase without merge commits

Start state

wechatimg329

Way1: normal rebase

git checkout mt5
git rebase mt6

wechatimg330

Way2: preserve merges

git checkout mt5
git rebase mt6 --preserve-merges

wechatimg331 wechatimg332

dorawyy commented 6 years ago

Testcase2: Rebase with a merge commit

Start point

wechatimg333

Way1: normal rebase

git checkout mt11
git rebase mt12

wechatimg334 wechatimg335

Way2: --preserve-merges

git checkout mt11
git rebase mt12 --preserve-merges

wechatimg336

wechatimg337 wechatimg338 wechatimg339

dorawyy commented 6 years ago

Testcase3: Fast-forward rebase

wechatimg340

Way1: normal rebase

git checkout mt8
git rebase mt9

Way2: force-rebase

git checkout mt8
git rebase mt9 --force-rebase

Way3: force-rebase, preserve-merges

git checkout mt8
git rebase mt9 --force-rebase --preserve-merges

wechatimg341

dorawyy commented 6 years ago

Rebase- Interactive Mode

Everything is possible in this mode.