Duplicate files from merge conflicts

[codykallen]

It appears that you've had some merge conflicts in your recent work, that have been "resolved" by producing unnecessary files. Looking at the files in taxcalc, I believe the following list includes all of the files produced by merge conflicts. For each group, we need to figure out which one is correct and remove the others.

• current_law_policy.json, current_law_policy1.json, current_law_policy2.json, current_law_policy3.json, current_law_policy_pit_cit.json
• functions.py, functions1.py, functions2.py, functions3.py
• gst.csv, gst_updated.csv, gst1.csv, gst2.csv
• gst_weights.csv, gst_weights1.csv
• gst_records.py, gst_records1.py
• gstrecords_variables.json, gstrecords_variables1.json

@martinholmer @sebastiansajie

[sebastiansajie]

@codykallen , unfortunately during one of the issues i had with syncing with github, all my local files got uploaded into the repository. I need to clean it up.

[sebastiansajie]

@codykallen current_law_policy_pit_cit.json is a required file. This is used to generate the current_law_policy.json that combines the pit, cit and gst policies. I have deleted the others.

[codykallen]

@sebastiansajie has removed most of the extra files. Are the following also duplicates from merge conflicts?

• gst.csv and gst_updated.csv
• gst_weights.csv and gst_weights1.csv

[martinholmer]

@codykallen said several months ago in issue #141:

@sebastiansajie has removed most of the extra files.
Are the following also duplicates from merge conflicts?

• gst.csv and gst_updated.csv
• gst_weights.csv and gst_weights1.csv

@sebastiansajie, is there a need for more cleanup? If so, I'd be happy to help.

I can't find anywhere in the top-level app*py files or in the lower-level taxcalc code any use of gst_updated.csv. Do you want me to remove the gst_updated.csv file from the repository?

And I can't find anywhere in the top-level app*py files or in the lower-level taxcalc code any use of gst_weights1.csv. Do you want me to remove the gst_weights1.csv file from the repository?