Tue Mar 25
Git practice
Author：Noritaka
git rebase
git switch -c feat
insert "add to feat"
git commit -a --no-edit
git rebase main (resolve the conflict in ghe feat branch)
git commit -a --no-edit
git rebase --continue
git switch main
git merge feat --no-ff --no-edit