Closed AngeloThys closed 2 months ago
The kata states
rebase quickfix on master
quickfix
master
When it should state: rebase master on quickfix.
git rebase quickfix master
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'mainBranchName': 'remote', 'mainBranchOrder': 2}}}%% gitGraph commit id: "A" branch master order: 1 commit id: "B" checkout remote branch quickfix order: 3 commit id: "C"
%%{init: { 'logLevel': 'debug', 'theme': 'base', 'gitGraph': {'mainBranchName': 'remote', 'mainBranchOrder': 2}}}%% gitGraph commit id: "A" branch quickfix order: 3 commit id: "C" branch master order: 1 commit id: "B"
The kata states
When it should state: rebase
master
onquickfix
.Example code
When rebasing, you replay the commits of the second argument -master- onto the first argument -quickfix-, therefor, it is only correct to state that master should be rebased on quickfix.
To go from
To