search

F4IF / ctree-demo

Collaboration Tree - A community discussion platform built for maximum insight with minimum oversight.
http://demo.ctree.org
Other
37 stars 22 forks source link

Add package.json to MVP #152

Open thatnerdjosh opened 2 months ago

CSchmitz81 commented 1 month ago

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 commented 1 month ago

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