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

Add package.json to MVP #152

Open
wants to merge 1 commit into
base: mvp
Choose a base branch
from
Open

Add package.json to MVP #152

wants to merge 1 commit into from

Conversation

thatnerdjosh
Copy link
Contributor

No description provided.

@CSchmitz81
Copy link
Member

I didn't see any specific issues with this, but I'm a little concerned about how it's likely to conflict with changes to master. It looks like the last commit from master to be merged back into the mvp branch was bf1e957 in Feb 2019, and there have been 5 commits to master since then (including adding the package files via PR #151) that didn't get merged into mvp. It may be worth checking if the latest changes from master can be merged back into mvp and regenerating the package files to see if there are any differences specifically needed for the mvp branch. If not, this can just be closed, since the new files would have already been merged into mvp from master.

@thatnerdjosh
Copy link
Contributor Author

I can rebase against master. I wasn't 100% sure about the timeline of the branches - thanks.

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

Successfully merging this pull request may close these issues.

2 participants