https://github.com/0xadada/git-exp-branch-rebase-merge

:chart_with_downwards_trend: Git repo demonstrating the rebase merge strategy
https://github.com/0xadada/git-exp-branch-rebase-merge

Last synced: 2 days ago
JSON representation

:chart_with_downwards_trend: Git repo demonstrating the rebase merge strategy

• Host: GitHub
• URL: https://github.com/0xadada/git-exp-branch-rebase-merge
• Owner: 0xadada
• Created: 2015-07-30T19:55:52.000Z (over 9 years ago)
• Default Branch: master
• Last Pushed: 2015-07-30T20:40:36.000Z (over 9 years ago)
• Last Synced: 2024-10-18T08:24:51.385Z (26 days ago)
• Homepage:
• Size: 121 KB
• Stars: 1
• Watchers: 3
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
# Git Experiment: Branch / Rebase / Merge

Experiment tests the workflow where there is a master branch, user checks

out feature branch from master branch. User commits work to feature branch.

Work continues in parallel in master branch. User on feature branch rebases

master `32785`, does a force-push to GitHub (required for pushing a rebase

to a published history). Finally `32789` on master, merges in feature

branch with a squash, and commits the commit message.

```

32758  echo "#1" >> 1

32760  git add -A && git commit -m "#1"

32762  echo "#2" >> 1

32763  git commit -am "#2"

32764  git push origin master

32765  git checkout -b feature

32766  echo "#a" >> a

32768  git add -A && git commit -m "#a"

32771  echo "#b" >> a

32772  git commit -am "#b"

32773  git push origin feature

32774  git checkout master

32775  echo "#3" >> 1

32776  git commit -am "#3"

32777  echo "#4" >> 1

32778  git commit -am "#4"

32779  git push origin master

32780  git checkout feature

32782  echo "#c" >> a

32784  git commit -am "#c"

32785  git rebase master

32788  git push origin feature --force

32789  git checkout master

32790  git merge feature --squash

32794  git commit -am "#5 git merge feature --squash"

32795  git push origin master

```

## Final History log

1. #5 - `git merge feature --squash` (includes #c, #b, #a)

1. #4

1. #3

1. #2

1. #1