TIL > rebase > squash

rebase (multiple commits and unnessary commit) is not good! >> option use squash (combines file from the last merge stage)

1. create signin file feature/signup (combine commit --> review applied + review applied 2)

2. main branch > remote main > pull >>>> push > feature branch >>> git rebase -i main

   a. how to use rebase >>> move to main >> current git pull origin main >> git rebase -i main >> editor is visible >> insert mode click i to change mode >> p, pick = use commit!! + s pick others below will be squashed...>> commit

3. when successful!! >> git log (commit message) >> push

>> esc -> :wq!

4. rebase push >>> when >> git push origin feature/login -f

5. after commit 2 times or 3 times, use rebase >> 충돌 적어진다

6. git add . >>> staging only, (don't commit!!) git add ./ git rebase --conitnue
   

============