I opened a pull-request on GitHub and got minor comments from reviewers. After addressing them, should I amend the commit and then 'git push --force', or create a new commit and push? In the latter case, what do I write in the commit message? And is there a way to squash these review commits when the change is merged?

I feel stupid for having to ask, but I haven't had a chance to contribute to opensource projects while being a sarariman 😅

@codewiz If the change is insignificant I'd amend. If it's a change that makes sense in isolation I'd just append it as a new commit.

@rune Ah, you can do either way. That's why I was finding opposing advice.

Will the reviewers still be able to see the diffs since their last comments if I amend?

@codewiz @rune another way to do it is to make separate commits even for minor fixes, and one you the LGTMs, you squash everything. That way, it's easy to review and it does not pollute the main branch after the merge

@angristan @rune Ah, is there a checkbox in the GitHub UI to merge with --squash?

@codewiz When you go to merge a pull request the button has an arrow dropdown on the right side letting you choose how you want to merge, see: help.github.com/en/github/coll

· · Web · 1 · 0 · 1

@djdavid98 @rune @PeterCxy @angristan This was the PR, btw:
github.com/ascent12/drm_info/p

It's nothing special, just something I used to debug the HDR stuff.

Sign in to participate in the conversation
Equestria Social Network

⚠️ Due to some spam, the instance is currently on approval admission mode, I will work to accept account as soon as I can. ⚠️

⚠️ En raison de spam, l'instance est en mode approbation manuelle des comptes, J'essaye d'autoriser les comptes le plus rapidement possible. ⚠️

Equestria.Social (EQS) is a Mastodon instance for all pony fans, created to federate Bronies and Pegasisters wanting to join the fediverse, and those already present ! But we are opened to everyone !

Equestria.Social (EQS) est une instance Mastodon pour tous les fans de poneys, créée pour fédérer les Bronies et Pegasisters voulant rejoindre le "fediverse", et ceux déjà présents ! Mais nous sommes ouverts à tous !

Equestria.Social (EQS) is a Mastodon instance for all pony fans, created to federate Bronies and Pegasisters wanting to join the fediverse, and those already present ! But we are opened to everyone !


Nos copains ! (Aussi fans de poneys)

Our friends ! (Also pony fans)

Radio Brony

Webradio Brony

Brony Webradio

Canterlot Comics

Bibliothèque de comics

Comics library

Le Poney Blanc

Magazine autour de MLP

Magazine about MLP

MLP Québec

Actualités sur MLP

News about MLP

MLP Rainbow

Actualité autour de MLP

News about MLP

Bronies .fr

Calendrier de meet-ups Bronies

Bronies meet-ups calendar

New Lunar Republic

Streaming MLP

MLP streaming

MLP France

Streaming MLP

MLP streaming

Need for Ponies

Streaming MLP

MLP streaming

Le Coin Brony

Communauté Brony

Brony Community


Si vous le souhaitez, vous pouvez aider financièrement l'instance sur LiberaPay (C'est un peu comme Patreon ou Tipeee, mais en libre).

If you wish, you can financially help the instance on LiberaPay (It's a bit like Patreon or Tipeee, but free).