Most probably the manual fix-attempt will have introduced bugs. The problem is that there isn't a particularly elegant way to deal with it. Compare files, compare diffs, understand the code changes and edit accordingly. The two delayed SSP PRs are good diffs to study, they introduced the changes that conflict with the current PR. Those went quite deep into the Epochs internals, especially data getting, and the code is quite sensitive to minor changes in the order of the statements ...
I can take a look tomorrow. But I will pull from your current remote, this way the diffs are separate and as displayed in the discussion. Please don't push to your remote at this stage ;-)

On 06.07.2013, at 01:02, mainakjas <notifications@github.com> wrote:

> In mne/realtime/epochs.py:
> 
> > +
> > +    Parameters
> > +    ----------
> > +    client : instance of mne.realtime.RtClient
> > +        The realtime client.
> > +    event_id : int | list of int
> > +        The id of the event to consider. If int, only events with the
> > +        ID specified by event_id are considered. Multiple event ID's
> > +        can be specified using a list.
> > +    tmin : float
> > +        Start time before event.
> > +    tmax : float
> > +        End time after event.
> > +    n_epochs : int
> > +        Number of epochs to return before iteration over epochs stops.
> > +    consume_epochs : bool
> well, I did that with not so great results. My examples didn't work any more. I went back using git reflog and then tried again more carefully. No luck - it seems that the automatic merge might be going wrong somewhere, but I don't know exactly where. should I push the latest version so that you can have a look what went wrong? what's the best strategy?
> 
> —
> Reply to this email directly or view it on GitHub.