In the app folder, with local/master sync with origin/master
git checkout -b remote_branch_to_test
git pull remote_branch_to_test
==> asure local master is up to date
git checkout master
git fetch origin
git pull origin master
==> open new branch to merge
git checkout -b new_local_branch
git merge remote_branch_to_test
==> resolve conflicts
git commit -m "remote branch conflict resolved"
git push origin new_local_branch
==> PR for new_local_branch merged with remote_branch_to_test with resolved conflicts. No conflicts, merge should be posible.
==> update local master again
git checkout master
git pull
==> deploy
cap production deploy
==> Execute locally or the rails console
rails c
==> Execute task to upload the version file that has to updated in development.
cap production setup:upload_version_file
Version can be display in the ‘/version’ route