test: add regression test for issue #776

[bcheidemann]

Part of #776 / #414

[bcheidemann]

Added a test which demonstrates #776

[humphd]

Please rebase this to pick up the new code in tests/index.js

[bcheidemann]

Please rebase this to pick up the new code in tests/index.js

Hey, I think I'm being a noob but I'm trying to rebase master and it tells me there are no changes. I did pull from master though so I have the changes to index.js now

[humphd]

You've merged, which you don't want to do (i.e., we'll integrate on master). The workflow goes like this:

# 1. Get your master updated
git checkout master
git pull upstream master

# 2. Make a branch for your work
git checkout -b issue-776

#3. Fix everything, add push.  Review get done, and your branch is out of date with master.
# Get the latest work on master, rebase your branch on master, force push it to origin.
git checkout master
git pull upstream master
git checkout issue-776
git rebase master
git push origin issue-776 -f

Before we go to do the final merge, we'll often squash the commits as well:

# Do an interactive rebase, squash everything down to a single commit, fix up the commit message
git rebase master -i
git push orign issue-776 -f

Then the history on master is a bunch of single commits, which is a lot easier to revert if something goes wrong.

[bcheidemann]

@humphd Thanks for showing me the workflow! Really appreciate it =) I've pulled master, done a rebase and force pushed as you describe. Is this correct?

[humphd]

Looks good.