-
Notifications
You must be signed in to change notification settings - Fork 1
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
cowsay-files repo using main not master branch #1
Conversation
use main branch not master
Thanks for the PR! The code change looks good to me. I was able to reproduce the issue on my macOS 12.6.9 VM "monty" running brew 4.1.11, using the current cowsay-org/cowsay-files repo's head:
Tested your change from this PR locally, and it worked:
(You can ignore that "Xcode out of date" warning; that's just an issue with my local Mac's setup.) I'd like a slightly different commit message wording, with the formula name as a prefix; same convention that the main Homebrew taps use. Like, "cowsay-files: use main branch instead of default master branch" instead of just "use main branch". So one can easily see which formula(e) is affected by each commit when skimming through a history of several git commits, like this:
See how the formula-specific changes say "cowsay-apj" or "cowsay-files" in them somewhere? The "Update README..." and "update links..." commits that don't name a formula are for commits that apply to the cowsay-org/homebrew-cowsay repo/tap as a whole. I'll try to tweak your commit message myself, while maintaining author attribution, and do a manual merge instead of going through this PR. I don't think that'll be hard. In the future, please create your PRs from dedicated work branches on your forked repo instead of main or master, like e.g. a "cowsay-files-use-main-not-master" branch for this PR. That makes discussion and record-keeping easier. And as soon as you want to work with more than one pending PR or set of changes at once, you'll pretty much need that. (I think you'll see the issue as soon as I merge this commit if you then try to do a pull from upstream on your forked repo here.) That'll also avoid the whole big "detached HEAD" warning message you see in my terminal script posted above. |
Merged this in 6b9c42b. I did this with a manual merge, editing your commit message but leaving the Author info. Looks like that worked, and your author credit was preserved. (At least with respect to GitHub usernames; it's using a "803618+andrewcrook@users.noreply.github.com" email address for you, but it seems like GitHub is linking that to your GH account no problem; I'm not very familiar with that mechanism.) If I screwed something up here, let me know; I'm willing to do a force-push to fix it if it's within the next couple days. Thanks again for the PR! |
no problem, re the email address that’s just hiding my main address everything gets forwarded through it. I suppose it could use a gmail account and publish its address but it just turns into a spam fest. |
Cool beans. All done here, I think. Thanks again! |
cowboy-files repo using main not master branch
As mentioned
paulkaefer/cowsay-files#32 (comment)