Update tk core with upstream - SqueezeStudioAnimation/tk-core GitHub Wiki
1. Clone your fork:
git clone [email protected]:YOUR-USERNAME/YOUR-FORKED-REPO.git make sure you are on the master_squeeze_new
2. Add remote from original repository in your forked repository:
cd into/cloned/fork-repo
git remote add upstream git://github.com/ORIGINAL-DEV-USERNAME/REPO-YOU-FORKED-FROM.git git fetch upstream
3. Updating your fork from original repo to keep up with their changes:
git pull upstream master
4. Merge conflict
Resolve any merge conflict Make sure that the squeeze changes are still there.
5. Create your own branch
Create a branch named squeeze_v[tk-core new version]
6. Push and create pull request
Push your branch upstream and create a pull request
7. Create a tag
Once the pull is approved, create a tag of the new version with the branch name.