https://github.com/maketheworldwise/github-merge-strategy
Github three merging strategies
https://github.com/maketheworldwise/github-merge-strategy
git github merge
Last synced: about 1 month ago
JSON representation
Github three merging strategies
- Host: GitHub
- URL: https://github.com/maketheworldwise/github-merge-strategy
- Owner: maketheworldwise
- Created: 2023-07-16T04:03:00.000Z (almost 3 years ago)
- Default Branch: main
- Last Pushed: 2023-07-23T04:58:20.000Z (almost 3 years ago)
- Last Synced: 2023-07-23T05:36:36.862Z (almost 3 years ago)
- Topics: git, github, merge
- Homepage:
- Size: 608 KB
- Stars: 0
- Watchers: 1
- Forks: 0
- Open Issues: 0
-
Metadata Files:
- Readme: README.md
Awesome Lists containing this project
README
# Welcome to github-merge-strategy 👋
> There are three merging strategies in Github. Merge, Squash, Rebase. This project is intended to see how each strategy works.
- Merge commits
- Squash merge
- Rebase merge
## ✅ Test
This is my base git history.
```shell
[merge]--[squash]--[rebase]--[readme]
```
1. I've made feature1 branch and three files in it. This is how it will be look like when using **merge**.
```shell
main branch:
[a]--[b]--[c]
/ \
[merge]--[squash]--[rebase]--[readme]--[test1]--[commits]
```
2. Then I've made feature2 branch and three files in it. This is how it will be look like when using **squash**.
```shell
main branch:
[a]--[b]--[c]
/ \
[commits]--[test2]--[a*b*c]
```
3. Lastly I've made feature3 branch and three files in it. This is how it will be look like when using **rebase**.
```shell
main branch:
[a]--[b]--[c]
/ \
[a*b*c]--[test3]------[a]--[b]--[c]
```
## 💁🏻 Results
The result of these test will be like this.
## Author
👤 **Kevin Ahn**
- Github: [@maketheworldwise](https://github.com/maketheworldwise)