doc: mention travel funds

[joyeecheung]

No description provided.

[joyeecheung]

I am also raising a PR in the Node core onboarding guide (nodejs/node#16079) that mentions the collaboration summit. Just making sure people are aware of it so they could prepare in advance and attend.

[Trott]

LGTM. Optional nit: Change the comma after travel expenses to a period and make see the beginning of its own sentence.

[joyeecheung]

@Trott Fixed, thanks!

[joyeecheung]

I assume we use the merge button here. Let me know if I've got it wrong.

[gibfahn]

I assume we use the merge button here. Let me know if I've got it wrong.

The Squash and merge button? I don't think it really matters for this repo, but in general disabling the Merge Pull Request button, and just leaving Squash and Merge and Rebase and Merge seems like a good way to go in repos that aren't nodejs/node.

[joyeecheung]

@gibfahn SGTM, though I am not good enough with Github to know how to do that.

[gibfahn]

@gibfahn SGTM, though I am not good enough with Github to know how to do that.

You'd go to https://github.com/nodejs/summit/settings and untick the Allow merge commits button (leaving the other two ticked), like so:

[ljharb]

fwiw I always only use the merge commit setting; GitHub's squashmerge and rebasemerge leave orphaned origin/pr/ refs in the git log (if you have enabled fetching of those).

Better is to rebase the fork's branch, push it up, and then merge commit or fast-forward merge (altho it's less convenient)

[joyeecheung]

@gibfahn Done, thanks for the help!

[joyeecheung]

@gibfahn I meant, for this repo. Not quite sure about others, probably best let the owners decide.

[gibfahn]

fwiw I always only use the merge commit setting; GitHub's squashmerge and rebasemerge leave orphaned origin/pr/ refs in the git log (if you have enabled fetching of those).

@ljharb Interesting reason to use merge commits. Does setting git config --global fetch.prune true fix that or does GitHub store them indefinitely (or until the person who raised the PR deletes their branch)?

I just have an alias for fetching PR branches instead of bulk fetching, so I hadn't noticed.

[ljharb]

It's stored indefinitely, no matter what happens to the branch, since it's a ref and not a branch.

[gibfahn]

It's stored indefinitely, no matter what happens to the branch, since it's a ref and not a branch.

@ljharb Ah, I see, so they're branches in a different git namespace? I didn't know that was a thing.

Assuming you're using something based on the original Bert Belder gist, it sounds like you can delete PR branches with: https://gist.github.com/piscisaureus/3342247#gistcomment-1763247, no idea if that actually works.