Skip to content

Conversation

@pacebes
Copy link
Contributor

@pacebes pacebes commented Mar 13, 2025

Resolves: #23792

Add/remove page breaks according to the issue description

  • I signed the CLA
  • The title of the PR describes the problem it addresses
  • Each commit's message describes its purpose and effects, and references the issue it resolves
  • If changes are extensive, there is a sequence of easily reviewable commits
  • The code in the PR follows the coding rules
  • There are no unnecessary changes
  • The code compiles and runs on my machine, preferably after each commit individually
  • I created a unit test or vtest to verify the changes I made (if applicable)

@pacebes pacebes force-pushed the 23792-AddRemovePageBreaks branch from 91a038c to a58fe13 Compare March 13, 2025 12:24
@bkunda
Copy link

bkunda commented Oct 17, 2025

@pacebes could you please rebase this so that we can test it? Thanks!

@cbjeukendrup cbjeukendrup self-requested a review October 17, 2025 14:47
@pacebes
Copy link
Contributor Author

pacebes commented Oct 17, 2025

@pacebes could you please rebase this so that we can test it? Thanks!

I'm afraid I am not able to do this in this PR. Therefore I will craete a new PR and close this one.

@cbjeukendrup
Copy link
Member

@pacebes Perhaps it's nice to give it a try anyway. As long as you keep the commit ID a58fe13 somewhere (hint: now it's here :) ), you can always go back.

To rebase:

  1. Checkout the PR's branch
  2. git pull --rebase upstream master (assuming upstream is the remote that points to musescore/MuseScore)
  3. Resolve conflicts and follow the instructions displayed by Git, i.e. git add . to mark files as resolved, and then git rebase --continue to move to the next commit
  4. git push -f (and in particular NOT git pull)

Good luck!

(But if it really doesn't work, then creating a new PR is also okay.)

@pacebes
Copy link
Contributor Author

pacebes commented Oct 17, 2025

@pacebes Perhaps it's nice to give it a try anyway. As long as you keep the commit ID a58fe13 somewhere (hint: now it's here :) ), you can always go back.

To rebase:

1. Checkout the PR's branch

2. `git pull --rebase upstream master` (assuming `upstream` is the remote that points to `musescore/MuseScore`)

3. Resolve conflicts and follow the instructions displayed by Git, i.e. `git add .` to mark files as resolved, and then `git rebase --continue` to move to the next commit

4. `git push -f` (and in particular NOT `git pull`)

Good luck!

(But if it really doesn't work, then creating a new PR is also okay.)

I have read this comment just after creating the new PR. Sorry @cbjeukendrup . I will make the most of the hint next time!

The new PR is #30597. I am closing this PR

@cbjeukendrup
Copy link
Member

No worries :)

@pacebes
Copy link
Contributor Author

pacebes commented Oct 17, 2025

I have closed this PR because it has been replaced by #30597

@pacebes pacebes closed this Oct 17, 2025
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.

Add/Remove Page Breaks (to match Add/Remove System Breaks)

3 participants