Updating a Feature Branch Using Merge

git-update-feature-branch-merge.md

Updating a Feature Branch Using Merge

Updating main

Update the local main branch.

git checkout main

Fetch the remote using -p or --prune option to remove nonexistant remote-tracking references. This stores commits to main in a local branch, remotes/origin/master

git fetch -p origin

Merge changes from origin/main into the local main branch. Now the main branch in up to date with the remote. If there are no commits, git will perform a "fast-forward".

git merge origin/main

Updating the Feature Brach

Check out the feature branch (ex. feature-117-xaml-update).

git checkout feature-117-xaml-update

Merge the updated main branch into the feature branch.

git merge main

Send Changes to Remote

Push changes to the remote.

git push origin feature-117-xaml-update