---
# System prepended metadata

title: Class 45 Browsers Project

---

### How to work on the project?

- create an issue and/or assign yourself to an issue so that your team knows which issue you are working on.
- The issues are all listed here https://github.com/abbathaw/class45-group2-browsers-project/issues
- Use the labels to determine if this ticket is must-have, should-have, or could-have.
- Focus first on the must-have, then the should-have. Everything else is could-have (which means nice to have, but the project works without it).




### Github guide to peaceful collaboration:

1. Always pull the master branch before you create a new branch

```
git checkout master
git pull
git checkout -b [branch-name]

```

2. Make changes, **save them**, and commit them often. Use clear commit messages.

```
git add .
git commit -m "Your descriptive commit message here"

```

3. When you are done with the piece you are working on, push your changes and create a new PR in github.

```
git push -u origin [branch-name]
```

4. Ask someone to review your code and approve it on github. Don't merge your PR right away.

![](https://hackmd.io/_uploads/Sy84k3aJ6.png)


5. After you merge your PR, delete your branch. Then repeat step 1 when you start a new ticket.


### Problems that might happen:

- **Your github PR shows all checks have failed**
    ```
    1 failing check
    @github-actions merge-changes / lint (16.x) (push) 
    ```

    Run `npm run prettier:write` and then commit again and push to your branch

- **Merge Conflict**
  - You can fix it on the github website, then mark the file as resolved, then commit. You should see the update to your PR.
  - You can also fix it locally
  	- First go to the master branch and pull the latest
  		```
  		git checkout master
  		git pull
  		```
  	- Switch to your branch again and merge the master to your branch
  		```
  		git checkout [your-branch]
        git merge master [your-branch]
        ```
    - You will get the merge conflict on your vsCode, which you can now fix the same way as on github website. 
Determine which code needs to be adjusted so that the conflict no longer exists. Ensure to remove those arrows and equal signs `<<<<` `>>>>>` and `=======`. Then add the change and commit.

    ```
        git add .
        git commit -m "merge conflict"
        git push origin [branch-name]
    ```
       
