search

mapping-elections / elections-data

Elections data from the early American republic
http://earlyamericanelections.org
13 stars 8 forks source link

17th congress #119

Closed jfbratt closed 6 years ago

jfbratt commented 6 years ago

Does not have the 16th congress data. That was merged after I branched.

lmullen commented 6 years ago

@jfbratt: I’m seeing some of the merge conflict indicators in the file, eg lines 9676 and 10595 ff. in the candidate totals data. Could you please check for those in all files?

lmullen commented 6 years ago

Why is the diff showing more deletions than additions?

jfbratt commented 6 years ago

The congressional-candidates-totals.csv had multiple iterations of the data (3 iterations). From what I read on merge tutorials, it was showing me the various versions of the file. I just didn't clean/choose the correct version. So I removed the other iterations. I don't know if I am explaining this well.

jfbratt commented 6 years ago

You can see that it was tripled in commit 7a70463

lmullen commented 6 years ago

So we are good to merge in your opinion?

jfbratt commented 6 years ago

It looks good to me. I will have to take some more time to go over merge tutorials.

lmullen commented 6 years ago

Okay this is merged in. Thanks for working on it. You can base the 18th Congress branch on master.