0

More than 3 years have passed since last update.

@wafuwafu13(わふわふ)

mergeとrebase完全理解した

Last updated at 2020-10-10Posted at 2020-10-10

Git MERGE vs REBASE のまとめ

masterブランチ

master.html

m1
m2
m3

masterブランチログ

m3
m2
m1

featureブランチ

master.html

m1
m2

feature.html

f1
f2

featureブランチログ

f2
f1
m2

最終的なファイル

master.html

m1
m2
m3

feature.html

f1
f2

git marge --squash feature

git add .
git commit -m "marge feature and master"

marge feature and master
m3
m2
m1

git rebase feature

f2
f1
m3
m2
m1

0

Register as a new user and use Qiita more conveniently

You get articles that match your needs
You can efficiently read back useful information
You can use dark theme

What you can do with signing up

0