search

mapping-elections / elections-data

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

Add Data From 12th Congress #112

Closed DanielKim1 closed 6 years ago

lmullen commented 6 years ago

@DanielKim1 This pull request has a merge conflict. I'm guessing it has to do with updated data on master between the time when you created this branch. Could you please update this branch and resolve the conflict?

DanielKim1 commented 6 years ago

@lmullen I finally figured out how to use mergetool, the pull request is good to go

lmullen commented 6 years ago

@DanielKim1 Brilliant. Do you have a sense of what went wrong with the merge initially?

DanielKim1 commented 6 years ago

The conflict came from the congress 11 data and the congress 12 data simultaneously being appended to the congress 1-10 data.

When I was adding data from congresses 11-13, I should have done the this:

  1. make new branch from master, add congress 11
  2. make new branch from sum(master, 11), add congress 12
  3. make new branch from sum(master, 11, 12), add congress 13

Instead, I did the following:

  1. make new branch from master, add congress 11
  2. make new branch from master, add congress 12
  3. make new branch from master, add congress 13