Open LeadFreeCandy opened 1 year ago
@Tripplenut This workflow looks less than ideal. There's no way we're going to be doing multiple merges into feature branches and then merging the merges back into main? Our commit history will look awful. I will fix these branches when I have time but students should be doing a rebase instead
this is 7 commits for slight changes to 1 file... interactive rebasing will be necessary
@LeadFreeCandy The thing is I rebased. Unless I'm just stupid and don't know how git rebase works but my process for each rebase is just:
git checkout feature-branch
git rebase main
git pull
git push
I think the history gets fucked cause I always forget to pull before the rebase and i'm just too lazy to fix it. Also if you wish to teach each person proper git techniques go for it. I don't really mind them just knowing how to commit, merge, and make a pr. I don't think the git workshop will be going over anything other than those 3 as we discussed it during the mentor meeting. If you want to teach them rebase, squash, and cherry pick make sure you do it well and we will also need to change some repo permissions.
Pull Request
Description
Please include a summary of the changes and the related issue (if applicable). Please also include relevant motivation and context. List any dependencies that are required for this change (if applicable).
Fixes # (issue)
Type of change
How Has This Been Tested?
Please describe the tests that you ran to verify your changes.
Checklist
Try to checkoff as much as possible if not everything!