search

webcompat / webcompat-reporter-extensions

Browser extensions to help report site compatibilty issues.
26 stars 21 forks source link

Fixes #90. Add Intern unit tests for isReportableUrl. #116

Closed laghee closed 6 years ago

laghee commented 6 years ago

r? @miketaylr

Lots of messy committing! (And I might have missed something in my delirium, just let me know.)

Edit: OK, more messy commit snarls, but I think I got all the leftover comments & the very, very sad comma.

miketaylr commented 6 years ago

Awesome!

Can you check out the error message from Travis?

https://travis-ci.org/webcompat/webcompat-reporter-extensions/builds/380409861#L465

(I should be able to review this tomorrow morning)

miketaylr commented 6 years ago

One tiny tip for rebasing against master so you don't end up with merge commits.

Since you're doing this from your fork, you need to make sure you have an upstream remote:

git remote -v will tell you that, and if you don't (but I assume you do?), https://help.github.com/articles/configuring-a-remote-for-a-fork/ has some help on that.

So the first step is to sync up remotes:

git remote update

This won't do anything destructive, it'll just make sure it knows about the latest changes on the server.

Then you want to do the rebase, which essentially means to put your local patches on top of any new stuff on master.

git pull --rebase upstream master

This is saying, pull in the latest stuff from the master branch on upstream remote, but as a rebase.

Assuming that works, you'll see something like "replaying your commits on top of blah".

But at this point, your local branch will be different from whatever you've already pushed to GitHub, so if you try to git push you'll get rejected. That's OK. It just means you have to force push:

git push -f

Just don't get too comfortable force pushing. :) It's always good to make sure you're not on master, for example. :))

Once you've done that, you've got the latest commits, and no merge commits, etc.

laghee commented 6 years ago

That makes sense. I've always been suspicious of -f and avoided it, so now I understand why merging was always wonky.

Do I have to check out my remote master to do update and pull --rebase, or can I do that directly from the branch?

Edit: Answered my own question. 😄

miketaylr commented 6 years ago

Thank you!