search

JasperVanDenBosch / niprov

provenance for neuroimaging data
BSD 3-Clause "New" or "Revised" License
9 stars 0 forks source link

Redo fix #116

Closed ktavabi closed 8 years ago

ktavabi commented 8 years ago

@ilogue this needs to be merged in place of previous PR using .tolist() that causes an AttributeError.

ktavabi commented 8 years ago

God I hate this shit :angry: how is there still conflicts after rebasing?

JasperVanDenBosch commented 8 years ago

I don't understand rebasing myself. There is a conflict because we both changed a version of mnefunsupport.py. Just add my change (moving the customprov line inside the loop) and mark as resolved, then commit.

JasperVanDenBosch commented 8 years ago

Looks like you merged redo-fix but you want to merge master, I think?

ktavabi commented 8 years ago

I want to merge upstream/master which is what I thought rebase onto does...

ktavabi commented 8 years ago

And when I try to merge now it says everything is up to date....ugh every time I PR 2 deletions it takes 34 commits to make it work