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

1298 links to multiple issues #1301

Closed

Conversation

michaelhkay
Copy link
Contributor

Changes stylesheet so that where a change entry refers to multiple issues or PRs, the links to each one are rendered correctly. (For an example, see "Lookup Expressions" in XQuery.)

@michaelhkay michaelhkay requested a review from ndw as a code owner June 24, 2024 15:50
@michaelhkay
Copy link
Contributor Author

For some reason this has pulled in other commits.

@ndw
Copy link
Contributor

ndw commented Jun 24, 2024

Generally speaking, the approach that I find works is:

  1. Check out your master branch
  2. Make sure you're in a clean state; stash outstanding edits or save them in a different local branch
  3. Pull the master branch from the "upstream" repo (qt4cg)
  4. Rebase your local master with upstream
  5. Checkout -b the branch you want to use for the PR you're planning
  6. Edit, commit, and push that branch
  7. Make a PR from it

What you want to avoid doing is the checkout -b step from an existing PR branch or a master branch that's not up-to-date with the upstream repo.

@michaelhkay
Copy link
Contributor Author

That's a pretty accurate description of (a) what I try to do, and (b) what goes wrong if you forget one of the steps.

@michaelhkay michaelhkay added the Abandoned PR was rejected, withdrawn, or superseded label Jun 25, 2024
@michaelhkay michaelhkay deleted the 1298-links-to-multiple-issues branch July 21, 2024 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Abandoned PR was rejected, withdrawn, or superseded
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants