Update .gitignore, requirements, and enhance indicators model with ne…#65
Update .gitignore, requirements, and enhance indicators model with ne…#65Abhishekfm wants to merge 1 commit into
Conversation
|
@Deepthi-Chand You'll see I extracted India-specific logic in #66 so that IDS-DRR can be redeployed by other jurisdictions. I would propose to move in that direction. In support of that, I'll make changes to that branch and to the new configuration files, that correspond to the changes here. I also plan to record a short video and share on Slack to demo how deployment-specific configuration changes can be made. Edit: My corresponding changes (specific commits referenced below this comment): 4d57de5...bff2eb4 I also added this branch's Assam CSV to the backend.zip attached to that PR. |
…eld, and add indicator CSV
fa47940 to
7fa32cd
Compare
|
To help reduce conflicts, I've squashed your commits. You can still find your original history at fa47940 Otherwise, this still conflicts with #66 if this is merged first, but I already made the corresponding changes per my above message, so the solution to the conflicts will be to just let the git merge -X reusable feat/datasource-linkOr one file at a time: git checkout --ours path/to/file
git add path/to/fileYou can preview the conflicts with (from the git merge --no-commit --no-ff feat/datasource-link(Then Conflicts are essentially:
|
No description provided.