microsoft / moaw

Grab-and-go resources to help you learn new skills, with all the tools you need to create, host and share your own workshop
https://aka.ms/moaw
Creative Commons Attribution Share Alike 4.0 International
109 stars 84 forks source link

Fabric Workshop Updates #51

Closed Jcardif closed 1 year ago

sinedied commented 1 year ago

It seems that it's an update of the workshop fabric-ss but the folder rename hasn't been tracked in git, so it all appears as new changes. It also not based on the latest changes that were previously merged, as I see a lot of commits that were already merged.

Could you please follow these steps to clean up your PR?

# save your changes in a branch
git checkout main
git branch fabric-updates-old

# restart your main branch from upstream
git remote add upstream https://github.com/microsoft/moaw.git
git fetch upstream
git reset --hard upstream/main  
git push origin main --force

# create a new branch and switch to it
git checkout -b fabric-updates-new

# cherry pick your changes from fabric-updates-old you want to reapply (I picked the `fix: workshop issues` one)
git cherry-pick d86f0aa

# rename the folder and track it to git
git mv workshops/fabric-ss workshops/fabric-e2e-serengeti
git add workshops/fabric-e2e-serengeti
git commit -m "Rename folder"

Then submit a new PR for the branch fabric-updates-new.

As a side note, it's always a good idea to create a new dedicated branch on your fork before sending a PR, as you can more easily update your main branch from upstream and keep your PR changes separated.

Thanks