1. Go to the FRONTEND/newFrontEnd/apTime folder
2. Open the terminal/command prompt and run:

• npx npm-force-resolutions
• npm install
• ng serve -o

clone the repo.

• For linux based os:

1. switch to bashiirUserUathFeature branch (git checkout bashiirUserUathFeature)
2. cd to userAuth/userAuth.
3. Open terminal and run: ./mvnw spring-boot:run -Dspring-boot.run.profiles=dev

• For windows os

1. manually install maven.
2. then run mvn spring-boot:run -Dspring-boot.run.profiles=dev.

Typically there are two ways to sync your personal branch with other (TestMaster) branch: merge or rebase (For the difference between merge and rebase, and other details, please check https://www.atlassian.com/git/tutorials/merging-vs-rebasing)

1. merge:
   1. Firstly, please sync your local repository:
      1. git checkout your-branch
      2. git fetch origin
      3. git pull
   2. Then, merge the target branch into your own branch:
      • git merge TestMaster (or other branch name)
   3. Then, push the changes into central repository:
      • git push
   4. Done. Your branch is syned with the target branch.
2. rebase
   1. Firstly, please sync your local repository (same with merge):
      1. git checkout your-branch
      2. git fetch origin
      3. git pull
   2. Then, rebase the current branch with the target branch:
      • git rebase TestMaster (or other branch name
   3. Now you should push the changes into central repository:
      • git push
   4. Done. Your branch is synced with the target branch.

Besides CLI (Command-line interface), we can also sync the branch via github website:

1. Open the target branch (TestMaster) in the web browser;
2. Click New Pull Request button;
3. In the Compare changes page, click the Base dropdown box, choose your branch as the base branch;
4. If there are any unsynced commits, the page will show the differences, and let you create a new PR with proper name and description;
5. After the PR is created, you should be able to merge the PR into your branch. Then your branch is synced successfully.