Instruction - How to merge your working branch into main: It happens when your work on your own branch is done.
- checkout to your own branch, commit all changes, sync
- create pull request
- find a team mate, goto github.com, in the repo, accept the pull request and review the conflict together if necessary.
- delete the branch you worked on, locally and remotely.
- checkout to main branch, fetch & pull and update your local main branch.
About dependencies update:
-
Frontend packages After your pulled the main branch, to keep your local dependencies to be always updated: use "npm install" in the console under frontend directory
-
Backend package use following command in the console under backend directory: dotnet add package Google.Cloud.Firestore dotnet add package Microsoft.AspNetCore.Authentication.JwtBearer --version 6.0.1
FontAwesome install: https://fontawesome.com/v6.0/docs/web/use-with/react/