-
Notifications
You must be signed in to change notification settings - Fork 2.8k
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
Mountain Dulcimer Updates #7033
Conversation
Thanks Niek, I tried to work out was causing that but wasn't able to. It seemed unrelated to my changes so I was hoping someone would weigh in. I'll keep a watch on PR 7032 as you suggest. |
Bad merge. Use |
I did the rebase as Jojo suggested; and my gitHub fork, and local, shows they are in sync with musescore 3.x upstream. But still the tests fail. |
No, apparently you didn't, you're having many (20 out of 21) commits in your branch that don't belong there. The vtests and mtests are known to be currently broken though, once again |
Yikes! I wish I could understand why that happened. I have touched only the one single file: instruments.xml. Here's what I did: 1. I copy/pasted your first command into my terminal. It came back and said there was no such repository. 2. I then spent an hour or so studying the rebase command documentation & some tutorials. 3. Based on that, and given that when I init'd my local git I did set the upstream URL to the musescore repo, I executed: [git pull --rebase upstream 3.x]. 4. I then executed [git pull] to pull the merged updates down to my local machine. Then I executed [git push -f]. 5. Git gave me messages that I interpreted as 'you're up to date with the upstream repo, and you have 1 unmerged commit.' 6. I then looked at this pull request on musecore and it had initiated the tests. Now, before I did all the above - on Dec-8 before Jojo made his recommendation to me, I used the [git commit --amend] command in an attempt to re-push my pull request without touching the instruments.xml file (I didn't want to do something like add a spurious space to make the file look to git like it had been edited). So perhaps this is what has messed the pull request up (beyond hope)? I fully confess that, having come out of the corporate banking world, I have no practical experience of using git on a large, highly, collaborative project such as this. I am making a good-faith attempt to learn, but haven't, so far, found any good tutorials on the particulars of using gitHub, a fork and a local repo in concert on a large project where deviations from the 'happy path' naturally occur. I have been referencing the Musescore Git Workflow page tho. |
Step 2 was correct, That So just do step 2 and 4 again. |
Ok, got it. Thanks Jojo. |
"Cancelled after 18m" ?? Now what's that about? I'm beginning to think that GitHub simply doesn't want my change. |
Just try again. Might have been a temp. glitch |
Extended the fret and pitch ranges of the three Mountain Dulcimer instruments to conform with what are now the common ranges for modern chromatic dulcimers. Dec-8: amending commit with no code change in order to trigger re-run of the mtests given the merge of PR #7032.
Success at last! Whew! Well, I figured this first, tentative, attempt at a pull request would be a learning experience; and I wasn't wrong about that. Thanks for helping me get to this point Jojo. |
We've all once been through those initial issues ;-) |
Extended the fret and pitch ranges of the three Mountain Dulcimer instruments
to conform with what are now the common ranges for modern chromatic dulcimers.
Relates back to, as a refinement: https://musescore.org/en/node/153016
A luthier pointed out to me that today's chromatic mountain dulcimer builds routinely extend the fret and pitch range a bit further down the fretboard. So I am here proposing updates to the three Mountain Dulcimer instrument profiles in instruments.xml.
This is my first pull request attempt, so please do point out any missteps I may have taken here. Also, it was unclear which branch I should go up against - the 3.x branch seems to be what the vast majority of pull requests are hitting so that is what I have used here.