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 link to Thor's docs [ci-skip] #44947

Merged
merged 1 commit into from May 8, 2022
Merged

Conversation

jasonkarns
Copy link
Contributor

@jasonkarns jasonkarns commented Apr 24, 2022

Summary

Fix Broken link in docs to Thor

Other Information

@rails-bot rails-bot bot added the docs label Apr 24, 2022
guides/source/generators.md Outdated Show resolved Hide resolved
@jonathanhefner jonathanhefner changed the title Fix link to Thor's docs Fix link to Thor's docs [ci-skip] Apr 24, 2022
@jonathanhefner
Copy link
Member

@jonathanhefner jonathanhefner commented Apr 27, 2022

@jasonkarns Would you mind squashing the commits? Then I'll give this a merge!

@jasonkarns
Copy link
Contributor Author

@jasonkarns jasonkarns commented May 8, 2022

@jonathanhefner i suppose. will need to get a clone of rails first. This PR was opened through github's UI. :/

Is it not possible for the person who merges to squash during merge?

Co-authored-by: Jonathan Hefner <jonathan@hefner.pro>
@jonathanhefner jonathanhefner merged commit 8dce413 into rails:main May 8, 2022
3 checks passed
@jonathanhefner
Copy link
Member

@jonathanhefner jonathanhefner commented May 8, 2022

@jasonkarns

Is it not possible for the person who merges to squash during merge?

Performing "Squash and merge" through the GitHub UI is different than squashing and then performing "Create a merge commit" through the GitHub UI. The latter creates a separate merge commit, which we prefer for bookkeeping and backporting.

I went ahead and checked out your branch, squashed, force pushed, and now merged.

Thank you for working on this!

(Backported to 7-0-stable in 54bd582.)

jonathanhefner added a commit that referenced this issue May 8, 2022
Fix link to Thor's docs [ci-skip]

(cherry picked from commit 8dce413)
@jasonkarns
Copy link
Contributor Author

@jasonkarns jasonkarns commented May 8, 2022

Performing "Squash and merge" through the GitHub UI is different than squashing and then performing "Create a merge commit" through the GitHub UI. The latter creates a separate merge commit, which we prefer for bookkeeping and backporting.

Gotcha. With the squash recommendation, I assumed the aim was to avoid the merge commit entirely. Thank you for handling it on my behalf. (Bummer that github's suggestion UI doesn't allow amending. Kinda defeats the ability to use the UI alone for small edits like this.)

Again, thanks for doing the extra work!

@jasonkarns jasonkarns deleted the patch-3 branch May 8, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants