docs: How to rebase a branch before a PR

[fyliu]

Overview

We need documentation for how to rebase a development branch in preparation for opening a PR so that developers can avoid conflicts in their PRs. This happens often enough that we should create this guide even before the MkDocs migration.

Action Items

• documentation for rebasing a branch onto the latest main
  • instructions for resolving merge conflicts
  • instructions for resolving migration file conflicts
• go to ER: Developer support items from #188 #189, check off the item relating to this issue, and close ER: Developer support items from #188 #189

Resources/Instructions

• compare rebase with merge, why we want to choose rebase over merge
• steps to rebase
  • make sure the code works well in the branch
  • optional interactive rebase to simplify commit history
  • fetch hackforla/main
  • git rebase hackforla/main
  • resolve merge conflicts
  • resolve migration file conflicts

[ExperimentsInHonesty]

@alexlaw528 Please provide update

1. Progress: "What is the current status of your project? What have you completed and what is left to do?"
2. Blockers: "Difficulties or errors encountered."
3. Availability: "How much time will you have this week to work on this issue?"
4. ETA: "When do you expect this issue to be completed?"
5. Pictures or links* (if necessary): "Add any pictures or links that will help illustrate what you are working on."

• remember to add links to the top of the issue if they are going to be needed again.

[alexlaw528]

@ExperimentsInHonesty Currently in progress. @fyliu should I include the procedure for properly using the django-linear-migration?

[fyliu]

@alexlaw528 it would be great if you can add that. No worries if you don't get around to it. Thanks!

[fyliu]

Moved back to backlog since Alex is no longer here.