Git fork Project code with upstream synchronization

1. Add the remote source of the upstream code base to the Fork's code base, which can only be done once.

# upstream represents the upstream code base name and can be arbitrary.

Git remote add upstream "git address"

2. Commit the local changes to commit

Git commit

3. Synchronize with the upstream repository by doing the following before each pull Request.

3.1:git Remote Update upstream

3.2:git rebase upstream/{branch Name}

PS: Before Operation 3.2, to checkout to the branch specified by {branch name},

such as: git checkout Develop

4. Push code to Github

git push

If there is a conflict in the synchronization process:

can use

git status//view conflicting files

After resolving the conflict, then

git rebase--continue//Continue syncing

Git fork Project code with upstream synchronization