Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Handle Ns and fix #684 #688

Merged
merged 1 commit into from
Sep 1, 2016
Merged

Handle Ns and fix #684 #688

merged 1 commit into from
Sep 1, 2016

Conversation

octref
Copy link
Contributor

@octref octref commented Sep 1, 2016

  • Commit message has a short title & issue references
  • Each commit does a logical chunk of work.
  • It builds and tests pass (e.g gulp tslint)

@rebornix
Copy link
Member

rebornix commented Sep 1, 2016

@octref do you mind rebasing against master to resolve the conflicts, others are perfect.

@jpoon
Copy link
Member

jpoon commented Sep 1, 2016

Although, the commits can be squashed automatically by GitHub when we merge the PR, still good practice to squash commits to logical chunks of work.

http://programmers.stackexchange.com/questions/263164/why-squash-git-commits-for-pull-requests

@ThatRendle
Copy link
Contributor

ThatRendle commented Sep 1, 2016

I will be very happy when this gets released. VSCodeVim is now good enough for me to be using Code as my primary editor. 🎉 😄

Pro Tip: I've started using GitKraken to do squashes with a helpful GUI (it's also very good for diff/merge).

Use native canBePrefixedWithCount
@octref
Copy link
Contributor Author

octref commented Sep 1, 2016

@rebornix @jpoon Done. Thanks for the tips!

@markrendle Thank you, I might look into it if it has good diffs. I'm good on CLI git for now.

@rebornix rebornix closed this Sep 1, 2016
@rebornix rebornix reopened this Sep 1, 2016
@rebornix
Copy link
Member

rebornix commented Sep 1, 2016

The failing test has nothing to do with @octref 's change so close/reopen it to trigger the CI again.

@rebornix rebornix merged commit 9b28a33 into VSCodeVim:master Sep 1, 2016
@jpoon
Copy link
Member

jpoon commented Sep 1, 2016

Thanks @octref.

@rebornix, you should be able to restart the builds through Travis presuming Travis inherits the GitHub rights.

@rebornix
Copy link
Member

rebornix commented Sep 1, 2016

@jpoon thanks for the info, don't know yet I have the power to manage Travis 💯 !

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants