If we do a squash merge, how do we then update the feature branch?

When using squash merge, the commit history from the feature branch is combined into a single commit when merging into the main branch. To update the feature branch after such a merge, you need to rebase the feature branch onto the updated main branch. This will synchronize the history and prevent conflicts during further development.

Example commands:

# Switch to the feature branch
git checkout feature-branch

# Rebase onto the main branch (e.g., master)
git fetch origin
git rebase origin/master

If conflicts occur, resolve them, then continue the rebase with git rebase --continue. After a successful rebase, you can push the changes with the --force or --force-with-lease flag.