Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Reconcile differences that have arisen between master and production #777

Open
rdhyee opened this issue Jan 31, 2020 · 0 comments
Open

Reconcile differences that have arisen between master and production #777

rdhyee opened this issue Jan 31, 2020 · 0 comments
Assignees

Comments

@rdhyee
Copy link
Collaborator

rdhyee commented Jan 31, 2020

From Comparing master..production · ekansa/open-context-py -- specifically, Comparing 50f929d36f058706a468f6b9159a9ccaa701c8d3..b34c86602af5597e8103a26dff6475c65d41912f · ekansa/open-context-py:

git diff master..production

# specifically

git diff 50f929d36f058706a468f6b9159a9ccaa701c8d3..b34c86602af5597e8103a26dff6475c65d41912f

we see differences in the following files:

$ git diff --name-status 50f929d36f058706a468f6b9159a9ccaa701c8d3..b34c86602af5597e8103a26dff6475c65d41912f
M       Pipfile.lock
M       requirements.txt
M       static/oc/js/image-proxy.js
M       sysadmin/build.yml
M       sysadmin/templates/start-no-db.sh.j2
M       sysadmin/templates/startup.sh.j2

For this issue, the plan is to create 2 PRs (one for master and one for production) to bring them into line:

When both these PRs are merged, production and master will have the same tree: https://github.com/rdhyee/open-context-py/compare/I777_master..I777_production

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

2 participants