NorwoodAndBrixtonFoodbank / nbf-website

https://main.d3dkw68f839t0q.amplifyapp.com/
5 stars 2 forks source link

#180: Driver overview status change #361

Closed AmeliaIsCoding closed 4 months ago

AmeliaIsCoding commented 4 months ago

What's changed

Screenshots / Videos

Before After
image image

Checklist

If you have made any changes to the database...

8kristy commented 4 months ago

Also very random tip but I noticed you have some repeated stuff in your git history (even though it just looks like you did 2 things and named them the same) - you don't need to do anything now since everything gets squashed on merge anyways, but if you ever need/want to keep your git history a bit cleaner, you can use git rebase -i <target_branch>. It's a bit tricky but you can "rewrite history" by squashing some of your commits together, reordering and renaming them (it's very easy to mess up with all the conflicts that pop up so just remember that you can always revert with git reset --hard origin/<your_branch_name> - as long as you haven't pushed the changes to remote!!)

Not sure how much you know about rebase but it's an alternative to merging - just puts your commits on top of the branch on which you're rebasing (so you can just do git rebase <target_branch> - the -i just puts you in interactive mode which allows you to mess with the commits)

Just thought it might be something interesting :)