Julien Wajsberg

@sv99 have you seen my last message here? https://github.com/mozilla-b2g/gaia/pull/24657#issuecomment-58313949 It would be kind if you can look at this while we're here. Otherwise we can file a separate bug if...

Ah you did some changes in the merge commit again :( and this is painful to edit. Next time please rebase and push -f to your branch...

I think that's because you use "--amend" when developing; so as a result you appended changes to your merge commit.

> What steps to push changes without --amend? while we review, we don't need one commit, so just commit normally. When we're done reviewing, you can squash the commits using...

to recover from your merging issue, the easiest in my opinion is: - merge upstream - diff with upstream to a separate patch - create a new branch from upstream...

From @crdlc in a separate commit: > Why don't we cancel the touch behavior when we receive a scroll event although slowly instead of asking for scrollTop? This operation implies...

I still want to do this.

Something landed today in thread_ui_test.js and provoke a conflict. Good, this is a good exercize ;) Here is how you can fix it: ``` shell git fetch upstream git rebase...

https://bugzilla.mozilla.org/show_bug.cgi?id=1080828 will likely provoke a conflict too :/ you're not lucky here, this piece of code was not changed for several months !

I hope you found your solution, but I believe the problem is that your `fetchMock` isn't the sandbox from your `node-fetch` mock. Indeed: ```js // By the magic of babel-jest,...