This article describes how to update your apps when a new version of the pOS Marketplace Template is released.
You most probably build your own app based on this template by cloning the pOS Marketplace Template repository. From time to time, the core template is updated. If you’d like to update your dependent project with the changes applied to the template you can merge those to your own repository.
First, set the upstream to the template repository:
git remote add upstream https://github.com/mdyd-dev/product-marketplace-template.git
After doing this once, you will be able to merge changes from the template to your own project repository:
git checkout master git pull git checkout -b update git fetch upstream git merge upstream/master --no-commit
After this, you will most likely have to resolve some conflicts if your code differs from the template. It is up to you to choose which changes you would like to keep and which will be overwritten by the changes in the template. When you resolved the conflicts and kept only the changes you want, push them to your repository:
git add * git commit -m "Resolving conflicts after update" git push
After these operations you will have a separate branch that has been updated with the code from the main template repository.