Skip to content

Conversation

@dseomn
Copy link
Contributor

@dseomn dseomn commented May 12, 2025

This fixes usage parsing for the changes in
tmux/tmux@68ffe65

Tested against tmux 3.5a and faf2a448 (Merge branch 'obsd-master', 2025-05-12).

@akinomyoga
Copy link
Collaborator

The CI was fixed in #1380. @dseomn Could you rebase the head branch on top of the latest master?

This fixes usage parsing for the changes in
tmux/tmux@68ffe65

Tested against tmux 3.5a and faf2a448 (Merge branch 'obsd-master',
2025-05-12).
@dseomn dseomn force-pushed the tmux-usage-change branch from d2fee26 to 073a888 Compare June 10, 2025 19:46
@dseomn
Copy link
Contributor Author

dseomn commented Jun 10, 2025

Sure, done.

@dseomn
Copy link
Contributor Author

dseomn commented Jul 15, 2025

Do you need anything else from me on this?

Also, do you know if there's some way I could make stacked PRs so I can have more than one open at a time without creating merge conflicts?

@akinomyoga
Copy link
Collaborator

Do you need anything else from me on this?

We're just busy.

Also, do you know if there's some way I could make stacked PRs so I can have more than one open at a time without creating merge conflicts?

That one is what I really wanted for a long time... I currently have many stacked changes. I tried to reduce the number of stacking PRs by compressing multiple independent changes into a single PR, but then the other maintainers didn't like it. Then, I technically have dozens of PRs waiting in a single line...

@akinomyoga
Copy link
Collaborator

akinomyoga commented Jul 15, 2025

There don't seem to be others' opinions on this PR, so let's merge this now.

@akinomyoga akinomyoga merged commit d7ae352 into scop:main Jul 15, 2025
7 checks passed
@github-actions github-actions bot mentioned this pull request Jun 24, 2025
@dseomn
Copy link
Contributor Author

dseomn commented Jul 15, 2025

Do you need anything else from me on this?

We're just busy.

Yup, thanks for merging.

Also, do you know if there's some way I could make stacked PRs so I can have more than one open at a time without creating merge conflicts?

That one is what I really wanted for a long time... I currently have many stacked changes. I tried to reduce the number of stacking PRs by compressing multiple independent changes into a single PR, but then the other maintainers didn't like it. Then, I technically have dozens of PRs waiting in a single line...

I looked into this a little bit, but didn't find much. If I have branches main <- branch-1 <- branch-2, I think I could create a PR to merge branch-1 into main in this repo, and a second PR to merge branch-2 into branch-1 in my fork. That doesn't seem ideal.

@dseomn dseomn deleted the tmux-usage-change branch July 15, 2025 20:47
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.

2 participants