Closed pdehaan closed 7 years ago
@6a68 I pushed a new commit and addressed feedback (hopefully)
👀
@pdehaan Looks great, but let's clean up the git history a bit:
git reset --hard HEAD~1
This will take the history from a tangled branchy thing (this is the gitk
rendering of the history):
back to a nice single line:
git rebase -i HEAD~3
You'll see these three lines in your editor:
pick 1a13ad1 Add ESLint
pick 2fcf1f7 Fix tests and address PR feedback
pick 386994e Allow template literal string quotes
Change 'pick' to 's' for the bottom two:
pick 1a13ad1 Add ESLint
s 2fcf1f7 Fix tests and address PR feedback
s 386994e Allow template literal string quotes
Save and close the editor.
When the editor pops back open with all the commit messages shown, I think you'd be fine to just keep the 'Add ESLint' line. Save and close again, and git will squash the commits.
# assumes 'origin' is the name of your mozilla remote
]$ git fetch origin && git pull --rebase origin master
There will be one conflict, but it's an easy one to resolve. Edit testpilot-metrics.js
:
<<<<<<< HEAD
/**
* Transforms `sendEvent()` arguments into a Google Analytics `Event` hit.
=======
/**
* Transforms `sendEvent()` arguments into a Google Analytics `event` ping.
>>>>>>> Add ESLint
* @private
* @param {string} method - see `sendEvent` docs
* @param {string} [object] - see `sendEvent` docs
Resolve the conflict by getting rid of the <<< and >>> lines and the old description:
/**
* Transforms `sendEvent()` arguments into a Google Analytics `Event` hit.
* @private
* @param {string} method - see `sendEvent` docs
* @param {string} [object] - see `sendEvent` docs
Save and close the editor.
Tell git you've fixed the conflict: git add testpilot-metrics.js && git rebase --continue
.
At this point, the rebase should successfully finish, and the changes in this PR will be cleanly applied as a single commit on top of existing history:
Once all that's done, force-push this branch and I'll land it :+1:
sweet! thx @pdehaan
Fixes #2