JoelLau

Git Help

Resolving Git Merge Conflicts With Rebase

1. pull latest commit to main branch

git checkout main

# pull latest meta-data
git fetch --all