search

usnistgov / pfhub

The CHiMaD Phase Field Community Website
https://pages.nist.gov/pfhub
Other
49 stars 40 forks source link

Disentagled revisions for @mfrichtl #1488

Closed tkphd closed 1 year ago

tkphd commented 1 year ago

This PR closes #1487. This is necessary since the base branch for that PR has diverged from the "master" branch on this repository, and merging it would create a lot of conflicts. This approach allows @mfrichtl to erase the divergent "master" branch from their fork and create a clean version from which to make PRs down the line.

review-notebook-app[bot] commented 1 year ago

Check out this pull request on  ReviewNB

See visual diffs & provide feedback on Jupyter Notebooks.

Powered by ReviewNB

pfhub commented 1 year ago

@tkphd, the new version of the PFHub website is available at https://random-cat-1488.surge.sh

mfrichtl commented 1 year ago

@tkphd Any thoughts on how my base branch would've diverged from this one? I rebased my repo with the NIST repo before committing my changes for this PR. Hopefully I avoid repeating whatever mistake I may have made this time.

tkphd commented 1 year ago

Hi @mfrichtl,

PR #1482 was merged "upstream" after you made your commits, which produced an irreconcilable difference in histories between your "master" branch and The One True master branch.

Going forward, I strongly suggest using a branching workflow: create a "feature branch" off of master before starting your work (or, at a minimum, before you make a commit), then submit a pull request against that branch rather than master. It might help to protect your master branch: really, no commit should be made to it unless it has gone through a reviewed pull request.

Some guidance on branching workflows: https://git-scm.com/book/en/v2/Git-Branching-Branching-Workflows

Shoot me an email if you want to discuss Git/GitHub workflows in more detail -- I'm always happy to help!