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 #91056: tempoLabel now changes appropriately #2321

Closed
wants to merge 0 commits into from

Conversation

awelch83
Copy link
Contributor

No description provided.

@awelch83
Copy link
Contributor Author

@Jojo-Schmitz Do I need to close this pull request and submit a new one?

Many months ago, I think showed me an alternative. It might've been git push --force

@Jojo-Schmitz
Copy link
Contributor

No need to close, see #1690, there is the explanation you refer to, and yes, git push -f is the last step of that

@awelch83
Copy link
Contributor Author

This is interesting. I literally just completed the changed that you had asked for, @Jojo-Schmitz, and when I came here to check on it I noticed that the pull request had already been merged. Did this happen automatically somehow, or did you just happen to be here the moment I pushed the update?

@awelch83 awelch83 deleted the 91056-tempolabel branch December 22, 2015 03:53
@Jojo-Schmitz
Copy link
Contributor

It isn't merged, you closed the PR and deleted the branch

@awelch83
Copy link
Contributor Author

What the hell... When I logged in and clicked the pull request, it said something along the lines of "Pull request has bee merged. You may safely delete the branch now"

I'll restore it then, I guess. I'm not sure what that was about.

@awelch83 awelch83 restored the 91056-tempolabel branch December 22, 2015 06:13
@awelch83
Copy link
Contributor Author

screen shot 2015-12-22 at 12 13 25 am

@awelch83
Copy link
Contributor Author

Was it merged, or not? I'm confused... You're saying it wasn't, @Jojo-Schmitz, and github seems to be telling me it was (see screenshot posted above).

@awelch83
Copy link
Contributor Author

Cool. No answer/explanation.

Not exactly the best way to encourage a motivated, new contributor to dig in and get involved. What's the point if their efforts (assuming the code is correct and passes tests) are going to be ignored? I'm receiving contradictory information and am trying to figure out what I need to do to get this pushed through. That knowledge, whenever someone chooses to impart it, is knowledge that I'll be able to utilize in the future with this project... @Jojo-Schmitz is telling me the pull request hasn't been merged. Github is telling me the pull request has been merged. Both can't be true.

@thomasbonte
Copy link
Contributor

thomasbonte commented Dec 23, 2015 via email

@Jojo-Schmitz
Copy link
Contributor

Also consider differences in timezone.
This PR has not been merged. Check the commit log, if you dont believe me.
It has been closed, by you, then you deleted and later restored the branch, at least that is what I see.

@lasconic
Copy link
Contributor

I didn't follow the whole thing but currently this PR is closed and empty. There are 0 commits in it.
If I go to your branch https://github.com/awelch83/MuseScore/tree/91056-tempolabel it's even with MuseScore master but doesn't contain any commit by you. So I assume github thinks that your branch has been merged because it's identical to master, but it's not the case. My guess is that you accidentally removed your commit from your branch.

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

4 participants