BreadBoxOrg / breadbox-web

3 stars 0 forks source link

Restructure and merge backend code before break. #23

Closed shivy02 closed 4 months ago

shivy02 commented 4 months ago

Description

We will need to create folders for different types of files that we need so that we don't have conflicts in the future. This will also be very important for code readability and documentation.

Solution

Refer to "Backend Folder Structure Wiki"

  1. Create a branch off of main for restructuring.
  2. Restructure the new branch.
  3. Restructure local working branches according to new branch.
  4. Merge restructuring branch.
  5. Merge person A's working branch.
  6. Person B pulls down main branch / resolves local conflicts
  7. Merge Person B's working branch.
  8. Create new branches.

OR

  1. Person A restructure code.
  2. Person B restructure code.
  3. Person B fetches from A.
  4. Person A fetches from B
  5. Merge one of the branches