as discussed in an earlier comment thread, we want to support multi-clie...

EliAndrewC / sideboard

BSD 3-Clause "New" or "Revised" License

0 stars 0 forks source link

as discussed in an earlier comment thread, we want to support multi-clie... #60

Closed EliAndrewC closed 10 years ago

EliAndrewC commented 10 years ago

...nt unsubscriptions

robdennis commented 10 years ago

I may have screwed up by merging in the other pull request :(, so I could use @EliAndrewC actually merging this one in to handle the conflicts.

EliAndrewC commented 10 years ago

Oh, I think that was my fault because earlier I did a git push instead of git pit origin currentBranchBeingPushed which meant that some changes to master also got pushed to this master, and the pull requests all said they could still be automatically merged, so I didn't go in and rewind the history (because that's terrifying), so maybe it's causing a problem now that one merge has happened.

I'll pull and do a manual merge and then push after fixing any conflicts when I get a chance.

robdennis commented 10 years ago

may be enough to go into this branch and pull from current master

EliAndrewC commented 10 years ago

Oh, there was actually a legitimate merge conflict here, since both this pull request and the remote websocket subscriptions modified the same method. Makes sense, I fixed the merge conflict manually so I'll go ahead and close this pull request and just push to master.