Updates and Development using Fork

Update required packages

If you need to upgrade required packages for OpenNFT, use following command in terminal

pip install -r requirements.txt --upgrade

If you need to downgrade a specific package due to its unstable work

pip install <PACKAGE_NAME>==<VERSION>

Update your Fork from OpenNFT repository

If you have your own repository forked from original OpenNFT, you can update it in the following way

_images/updates_1.png

Press ‘’Fetch upstream’’ to update your repository. If you are too behind in commits history, you will have to open pull request and resolve all conflicts

_images/updates_2.png

Otherwise, if there is no conflicts, you can press ‘’Fetch and merge’’ to update your fork

_images/updates_3.png

Resolve conflicts via PyCharm

In case if you faced conflicts which you can not resolve using GitHub, you can do following steps to resolve them manually

  1. Go to Git -> Manage remotes and add OpenNFT original repository as remote branch

_images/updates_4.png _images/updates_5.png

  1. Use Git menu in the bottom right part of your screen to checkout to master branch of original OpenNFT

_images/updates_6.png

  1. Return to your master branch and using the same Git menu press “Merge into current” on original master branch

_images/updates_7.png

After that you will be able to resolve all conflicts manually and push all changes to your fork.

Push changes from your local repository to GitHub

When you completed changes in your local repository, you can share them via commit and push.

  1. Press ‘’Ctrl+K’’ or green check mark on the top menu of PyCharm

  2. Check necessary files, which you want to commit, and fill commit message field

  3. You can push your commit from that window, by pushing green arrow (to the right of check mark) or pressing ‘’Ctrl+Shift+K’’ after commit is done.

_images/updates_8.png

  1. Make sure that destination of your push is correct ( <local_repository_name> -> <remote_repository_name:branch_name> ). You can check remote repository name and URL in Git -> Manage remotes menu.

_images/updates_9.png

Finally, if push succeeded, you will see it in you GitHub repository.

However, if you have troubles when pushing to your fork, check these settings.

Check pull requests locally

Following command in terminal will help if you want to check pull request to your fork locally

git fetch origin pull/<ID>/head:<BRANCHNAME>
git checkout <BRANCHNAME>