FAQ
How to sync the latest ShipAny code
- Create a new local branch to backup the current main branch code
Terminal
git checkout -b backup- Sync upstream repository code
Terminal
git checkout main
git remote add upstream [email protected]:shipanyai/shipany-template-one.git
git fetch upstream
git merge upstream/main --allow-unrelated-histories- Manually resolve conflicts
The pulled upstream code may conflict with your local modifications and needs to be resolved manually.
- Verify compilation
After resolving conflicts, it’s recommended to verify the local compilation to ensure the project runs normally and there are no compilation errors.
Terminal
pnpm build- Save and commit the merged code
Terminal
git add .
git commit -m "Merge upstream/main"
git push origin main