Git: merge --squash

preview_player
Показать описание

Рекомендации по теме
Комментарии
Автор

Nice.
The problem is when you pull in your branch any update that other people merged on main branch after you created your branch.

Let's say you have already one commit on your local branch, then you pull the updates from main, and finally do another commit.

Would that allow a merge back on main branch, using squash?

Fred_Klingon
visit shbcf.ru