You'll need to rebase you branch

```
git remote add upstream https://github.com/open-city/dedupe.git
git pull --rebase upstream master
```


On Tue, Jul 9, 2013 at 5:36 PM, nikitsaraf <notifications@github.com> wrote:

> In dedupe/convenience.py:
>
> >
> > -def blockData(data_d, blocker):
> > +        random_pairs = dedupe.core.randomPairs(n_records, sample_size)
> > +
> > +        return tuple((data_list_A[int(k1)], data_list_B[int(k2)]) for k1, k2 in random_pairs)
> > +    else:
> > +        random_pairs = dedupe.core.randomPairs(len(data_list), sample_size)
> > +
> > +        return tuple((data_list[int(k1)], data_list[int(k2)]) for k1, k2 in random_pairs)
>
> Since, this change will also need to be done on the master branch. So
> should I first make changes in the master branch and then pull the changes
> in data-matching branch or make the changes separately in both the branch ?
>
> —
> Reply to this email directly or view it on GitHub<https://github.com/open-city/dedupe/pull/132/files#r5104100>
> .
>



-- 
773.888.2718
2231 N. Monticello Ave
Chicago, IL 60647