Skip to content

highlight jsdoc optional param and optional param with default value#224

Closed
ryanoasis wants to merge 4 commits intopangloss:developfrom
ryanoasis:master
Closed

highlight jsdoc optional param and optional param with default value#224
ryanoasis wants to merge 4 commits intopangloss:developfrom
ryanoasis:master

Conversation

@ryanoasis
Copy link
Copy Markdown
Contributor

selection_024

@amadeus
Copy link
Copy Markdown
Collaborator

amadeus commented Dec 9, 2014

This looks good, but the branch has some weird merge commits that worked their way in.

Probably the easiest way to to fix would be to create a branch that is all up to date with this repo's develop. Assuming you added this repo as a new remote (git remote add source git@github.com:pangloss/vim-javascript.git), you would do:

git fetch source
git checkout source/develop
git checkout -b new-branch-name

Then simply cherrypick that single commit onto it:

git cherry-pick 9336404fac4549928ba1e8876cc4463677d3ce24

Then push that you branch to your repo:

git push -u origin new-branch-name

and then submit a PR using that new branch.

@ryanoasis
Copy link
Copy Markdown
Contributor Author

@amadeus yep I did notice that. thanks. i'll do that.

@davidchambers
Copy link
Copy Markdown
Collaborator

Superseded by #225

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