Keep feature branch in sync with main
Merge master/main into feature branch.
git checkout master / main
git pull
git checkout feat
git merge master / main
Merge master/main into feature branch.
git checkout master / main
git pull
git checkout feat
git merge master / main