search

rcpch / digital-growth-charts-documentation

Documentation site for all parts of the RCPCH Digital Growth Charts Project
https://growth.rcpch.ac.uk/
5 stars 8 forks source link

Updated documentation with tutorials #93

Open dc2007git opened 1 year ago

dc2007git commented 1 year ago

Creates React tutorial for opening the React component in Storybook. Take the user through installing Node.js, the React component and opening storybook. Adds a tutorial on creating a new Next.js tutorial

pacharanero commented 1 year ago

I've had a look at the PR, wasn't able to fully test locally though because somehow the Git history is unrelated to prerelease or any of our other branches. On Git Graph it's a separate line right back to our initial commit.

This should be fixable by rebasing the dc2007git/prerelease branch on origin/prerelease, then re-push the PR (might have to Force Push because this wil rewrite the history of the forked branch.

Happy to work this through on a call because Git Ops can get a bit weird if you're unfamiliar, sometimes even simple things can seem impossible, and I will admit Git is not terribly helpful sometimes.

dc2007git commented 1 year ago

I've had a look at the PR, wasn't able to fully test locally though because somehow the Git history is unrelated to prerelease or any of our other branches. On Git Graph it's a separate line right back to our initial commit.

This should be fixable by rebasing the dc2007git/prerelease branch on origin/prerelease, then re-push the PR (might have to Force Push because this wil rewrite the history of the forked branch.

Happy to work this through on a call because Git Ops can get a bit weird if you're unfamiliar, sometimes even simple things can seem impossible, and I will admit Git is not terribly helpful sometimes.

Yeah sounds good! Happy to jump on a call now if it works for you?

pacharanero commented 1 year ago

I'm actually out of the house - bouldering with kids but having been unwell this week I'm not climbing. So can't do a call. Have a look at rebasing, it may be a simple fix.

I'm not sure how the git history has ended up unrelated but sometimes a 'cheating' fix can be to save the files somewhere outside the Git repo, then delete and re-clone the repo. Make your feature branch and re-import the files that you've added/changed.

But try rebasing first

dc2007git commented 1 year ago

No worries, will let you know if I run into any roadblocks. Should be able to figure it out though.

dc2007git commented 1 year ago

Alright, so I think I've managed to get around it after some more tinkering. Rebasing didn't work so I've deleted the forked repo and cloned the new one. Created a new feature branch and cherry picked commits from 'prerelease' into it. The branches are identical now in terms of commits, so should I close this PR, and reopen one comparing the 'react-tutorial-branch' with 'prerelease'?