Skip to content

Conversation

HonkingGoose
Copy link
Contributor

@HonkingGoose HonkingGoose commented Aug 29, 2020

Changes

  • Add caution block warning readers to be careful when pushing amended commits

Context

I think we should be more explicit about git commit --amend being a good thing for commits that have not been pushed, but potentially problematic for commits that have been pushed already, as that alters the history for everybody who pulls the branch again.

Or do you want me to improve the [NOTE] block that's just above my newly created [CAUTION] block? Maybe having two blocks of warnings is a bit excessive?

@ben
Copy link
Member

ben commented Sep 6, 2020

You know, I actually kind of like the amount of emphasis that comes with backing two "note" type blocks right next to each other. Let's do this.

The only thing I'd suggest is maybe a pointer to the section where we talk about what happens when you do this, and how to clean it up.

@HonkingGoose HonkingGoose marked this pull request as draft September 7, 2020 07:33
@HonkingGoose
Copy link
Contributor Author

I marked this as a draft for now, until I've made the changes. I'll ping you when it's ready for another round of review. 😄

@HonkingGoose
Copy link
Contributor Author

Hi @ben, it's ready for another review. 😄

Changes:

  • Merge current master into pull request
  • Change my new [CAUTION] block into a [NOTE] block.
  • Add a link to the "Perils of rebasing" section
  • Remove unnecessary comma

@HonkingGoose HonkingGoose marked this pull request as ready for review September 7, 2020 16:18
@ben
Copy link
Member

ben commented Sep 11, 2020

@ben ben merged commit be83c57 into progit:master Sep 11, 2020
@HonkingGoose HonkingGoose deleted the add-caution-block-about-pushing-amended-commits branch September 11, 2020 19:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants