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

Update git.md with more details about squash/amend commits #2617

Merged
merged 10 commits into from
Jul 26, 2024

Conversation

vorburger
Copy link
Member

Follow-up to #2315 (comment) ...

Copy link
Collaborator

@bashir2 bashir2 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for clarifying the PR workflow @vorburger.

docs/contrib/git.md Outdated Show resolved Hide resolved
docs/contrib/git.md Outdated Show resolved Hide resolved
Co-authored-by: Bashir Sadjad <[email protected]>
@vorburger
Copy link
Member Author

@jingtang10 my understanding, from comments above, is that you are cool with this; I'm therefore (exceptionally) "self merging" this now...

@vorburger vorburger enabled auto-merge (squash) July 16, 2024 09:19
@vorburger vorburger disabled auto-merge July 26, 2024 10:13
Copy link
Collaborator

@jingtang10 jingtang10 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

thank you @vorburger!

docs/contrib/git.md Outdated Show resolved Hide resolved
docs/contrib/git.md Outdated Show resolved Hide resolved
docs/contrib/git.md Outdated Show resolved Hide resolved
docs/contrib/git.md Outdated Show resolved Hide resolved
docs/contrib/git.md Outdated Show resolved Hide resolved
@jingtang10 jingtang10 enabled auto-merge (squash) July 26, 2024 10:19
@vorburger vorburger disabled auto-merge July 26, 2024 10:21
@vorburger vorburger enabled auto-merge (squash) July 26, 2024 10:21
@vorburger vorburger merged commit 2ee4c58 into master Jul 26, 2024
6 checks passed
@vorburger vorburger deleted the vorburger-docs-git-squash-amend branch July 26, 2024 11:41
Copy link
Collaborator

@joiskash joiskash left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Great process. Just a nit, the fhir data pipes README has hyper links to git concepts like amend and squash etc.
Another nit, all the points start with 1. instead of 1,2,3

@vorburger
Copy link
Member Author

Great process.

@joiskash Thank You!

Just a nit, the fhir data pipes README has hyper links to git concepts like amend and squash etc.

If you would find this useful, would you like to raise a PR to proposing adding those? I'm happy to review it.

Another nit, all the points start with 1. instead of 1,2,3

That's not a problem, and "normal", in Markdown syntax, as per https://spec.commonmark.org/0.31.2/#lists, quote: "The numbers of subsequent list items are disregarded." (i.e. autonumbered, by the "Markdown Processor").

Ergo, on https://google.github.io/android-fhir/contrib/git/ where it's "rendered" (as described here), it's correctly numbered, of course. I hope this helps to clarify?

@joiskash
Copy link
Collaborator

joiskash commented Jul 29, 2024

Great process.

@joiskash Thank You!

Just a nit, the fhir data pipes README has hyper links to git concepts like amend and squash etc.

If you would find this useful, would you like to raise a PR to proposing adding those? I'm happy to review it.

Sure!

Another nit, all the points start with 1. instead of 1,2,3

That's not a problem, and "normal", in Markdown syntax, as per https://spec.commonmark.org/0.31.2/#lists, quote: "The numbers of subsequent list items are disregarded." (i.e. autonumbered, by the "Markdown Processor").

Ergo, on https://google.github.io/android-fhir/contrib/git/ where it's "rendered" (as described here), it's correctly numbered, of course. I hope this helps to clarify?

Yes it does, thank you! I was looking for an example and the documentation on this. Thanks for sharing.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
Status: Complete
Development

Successfully merging this pull request may close these issues.

4 participants