well, I managed to delete the local master branch and pull it fresh from upstream. Then I tried rebasing w.r.t. to master and it didn't look as bad as I expected. Something like this: 

```sh
First, rewinding head to replay your work on top of it...
Applying: Initial MNE real-time commit
Applying: [cleanup]
Applying: read real-time header info
Applying: set alias
Applying: cleanup and some coding python guide lines
Applying: read meas info
Applying: almost - read raw buffer doesn't receive all data jet
Applying: working raw buffer reading
Applying: code style
Applying: cleanup
Applying: WIP: realtime
Applying: BaseEpochs, various enh
Using index info to reconstruct a base tree...
Falling back to patching base and 3-way merge...
Auto-merging mne/epochs.py
CONFLICT (content): Merge conflict in mne/epochs.py
Failed to merge in the changes.
Patch failed at 0012 BaseEpochs, various enh

When you have resolved this problem run "git rebase --continue".
If you would prefer to skip this patch, instead run "git rebase --skip".
To check out the original branch and stop rebasing run "git rebase --abort".
```

Now, I've never done a merge before and the `mne/epochs.py` file is full of >>>>>>> and ======== , I'll try to figure out a way to fix it.