Updates

How to pull the latest updates?

To pull the latest changes you will need to merge potential conflicts.

Step-by-step Guide

We assume you already cloned your fork locally and have a branch like main or master.

1. Add the original repo as an “upstream” remote (one-time):

git remote add upstream https://github.com/shipngin/shipngin.git

2. Fetch upstream changes:

git fetch upstream

3. Create a temporary branch

git checkout -b shipngin-updates

4. Update your local default branch (choose merge or rebase):

• Merge (simple, keeps history as-is)

git merge upstream/main

• Rebase (linear history on top of upstream)

git rebase upstream/main

Resolve conflicts if prompted, then git rebase --continue. Rebasing “replays” your commits on top of upstream.

5. Push changes to the temporary branch:

git push

6. Review and test

Test your application thoroughly to make sure no breaking-changes were introduced.

7. Merge temporary branch back to main

git switch main
git merge --no-ff upstream-test
git push origin main

8. Update feature branches (if you have them):

git checkout my-feature
git rebase main