При разработке новой ветки для интеграции изменений с master можно использовать merge или rebase.
Сравнение этих подходов.
"Подводные камни" rebase.
Watch video 9.2 Git – Перемещение коммитов – Rebase и merge: сравнение подходов online, duration hours minute second in high quality that is uploaded to the channel JavaScript.ru 01 May 2021. Share the link to the video on social media so that your subscribers and friends will also watch this video. This video clip has been viewed 25,650 times and liked it 874 visitors.