Skip to content

Conversation

@egrace479
Copy link
Member

Add cherry-pick guide for fetching new material from upstream based on updating Imageomics Guide from Collab template

  • Pull from Collab Guide PR 35
  • Also updates the intro for better context based on the home guide of this page (i.e., that it's in the Imageomics Guide).

egrace479 and others added 3 commits November 20, 2025 14:15
based on updating Imageomics Guide from Collab template

Pull from Collab Guide [PR 35](Imageomics/Collaborative-distributed-science-guide#35)

* Add link to cherry-pick guide for instructions on updating personalized sites

* Fix typo in acknowledgments

* Clarify description and add link to cherry-pick guide for more info

* Add some intro to the page

* Add a little extra context/clarity

Co-authored-by: Matt Thompson <31709066+thompsonmj@users.noreply.github.com>

---------

Co-authored-by: Matt Thompson <31709066+thompsonmj@users.noreply.github.com>
@egrace479 egrace479 requested a review from NetZissou November 21, 2025 16:40
@egrace479 egrace479 added the src-upstream Update coming from the upstream repo label Nov 21, 2025
Copy link
Member

@hlapp hlapp left a comment

Choose a reason for hiding this comment

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

See inline comment about a (minor) potentially confusing statement.

Aside from that, I'm not sure what is being changed in the Acknowledgments text in the README, making me wonder whether this is a bogus change?

@egrace479 egrace479 requested a review from hlapp November 25, 2025 14:50
Copy link
Member

@hlapp hlapp left a comment

Choose a reason for hiding this comment

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

👍🏻

To nitpick, I notice some instructions pertaining strictly to using vi as the commit message editor, which is indeed the default but is also customizable as some other editor such as nano. Perhaps consider adding a note somewhere that those instructions make this assumption of using the default editor.

That said, it's not unreasonable to assume that if someone made the effort to change the default, they'd know what to do.

@egrace479
Copy link
Member Author

👍🏻

To nitpick, I notice some instructions pertaining strictly to using vi as the commit message editor, which is indeed the default but is also customizable as some other editor such as nano. Perhaps consider adding a note somewhere that those instructions make this assumption of using the default editor.

That said, it's not unreasonable to assume that if someone made the effort to change the default, they'd know what to do.

The purpose of including the vi instructions was to simplify things for those less familiar with the interface/working with git from the command line. I think adding an explanation might cause more confusion for that target audience; as you said, for those who aren't using the default, they probably know what to do and can recognize the distinction.

@egrace479 egrace479 merged commit 453b9f5 into main Nov 25, 2025
@egrace479 egrace479 deleted the dev branch November 25, 2025 16:39
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

src-upstream Update coming from the upstream repo

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants