search

web-full-stack / git

git squash vs git merge vs git rebase
MIT License
2 stars 0 forks source link

first PR #3

Open xgqfrms-GitHub opened 2 years ago

xgqfrms-GitHub commented 2 years ago

https://github.com/web-full-stack/git/tree/feature

image

https://github.com/web-full-stack/git/compare/feature?expand=1

https://github.com/web-full-stack/git/pull/2

xgqfrms-GitHub commented 2 years ago

normal merge

image

xgqfrms-GitHub commented 2 years ago 
# Step 1: `Clone` the repository or `update` your local repository with the latest changes.
$ git pull origin main

# Step 2: `Switch to` the `base branch` of the pull request.
$ git checkout main

# Step 3: `Merge` the `head` branch into the `base` branch.
$ git merge feat-rebase

# Step 4: `Push` the changes.
$ git push -u origin main

not rebase

image