[BUG] workflow doc doesn't follow the rebase workflow we want to use

NOAA-FIMS / collaborative_workflow

contributors guide to FIMS, managing collaborations

https://noaa-fims.github.io/collaborative_workflow/

4 stars 1 forks source link

[BUG] workflow doc doesn't follow the rebase workflow we want to use #106

Open ChristineStawitz-NOAA opened 1 year ago

ChristineStawitz-NOAA commented 1 year ago

Describe the bug We've been merging main into feature branches and this results in a very messy commit history - we are going to move to rebasing instead

To Reproduce Update your feature branch Update main

Expected behavior The user rebases the changes from main into their branch and does not use pull and merge

kellijohnson-NOAA commented 5 days ago

[ ] Find a link to a good rebase tutorial
[ ] Revise the instructions in the following section https://github.com/NOAA-FIMS/collaborative_workflow/blob/dcda6b1641e9fe7390e47a001ec63a5c62e3a5e8/07-contributor-guide.Rmd#L220
[ ] Add Git Hooks (client and server) to stop all pushes where main is merged into a feature branch
[ ] Notify all contributors that main should not be merged into feature branches

kellijohnson-NOAA commented 4 days ago

Some good guidance was brought out in the research conducted for seaside chat 4.