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

Fix #184246: Add same string option in select notes #3312

Merged
merged 1 commit into from
Nov 19, 2017

Conversation

techiespace
Copy link
Contributor

Select -> More: ability to distinguish same pitch on a specific string in Tabs

@Jojo-Schmitz
Copy link
Contributor

as mentioned on IRC: revision.h shoulnd not be there, check build/git/hooks/post-checkout and the README next to it on how to prevent this.

Copy link
Contributor

@Jojo-Schmitz Jojo-Schmitz left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That ain't any better, this file should not be in any commit. But I guess if you squash them it'll be OK

@techiespace
Copy link
Contributor Author

Did you mean squash? If yes, should I do it or it will be done by maintainers while merging the PR?

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented Oct 13, 2017

Yes I meant squash (and corrected that typo, I blame it on my mobile's autocorrect) and no this needs to be done by you prior have the PR merged

@techiespace
Copy link
Contributor Author

Sorry this is my first PR. I'm having some problems with git. To clarify I have to -

  1. Squash changes locally
  2. Push it to origin
  3. GitHub will automatically update the PR upstream.

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented Oct 13, 2017

Yes. You can also to a git reset HEAD^2 (or whatever it takes to go be to the state before your fìrst commit), then a git commit -m "Fix #184246:..." and finally a git push -f

@Jojo-Schmitz
Copy link
Contributor

Looks good now and should also go into 2.2 IMHO

@lasconic
Copy link
Contributor

Looks good. Will merge. I might add a check to see if there is some stringdata associated with the instrument, if not this option doesn't really make sense.

@lasconic lasconic merged commit 63a8379 into musescore:master Nov 19, 2017
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.

None yet

3 participants