This repository is to help our team learn how to use git and github. Here is a link to read more about git and github
- Install git and/or github desktop on your device.
- Clone the repository. This makes a copy of the files that you can edit on your machine.
- How to clone a repository (there are many different ways to do this)
- Check if an issue is assigned to you.
- Create a branch titled something meaningful, like"{Issue Number}-{descriptor of issue}"
- Example: Say I was assigned issue 123 that asked to implement a scroll bar. I could name my branch "123-scroll-bar" to show what I was working on.
- Sometimes, you will need to work on something that doesn't have an issue opened for it. I recommend opening a new issue that describes what you are planning to work on and name the branch as described above. Otherwise, still try to give a meaningful name to your branch (ex. "automated-tests").
- Names like "ashley-branch" or "new-stuff" are not helpful to someone reviewing the repository.
- On your new branch, implement your changes.
- Commit often. Commit early.
-
On github, a commit with two messages will show the first message as a preview and the second message when the commit is clicked. Please make the first message a brief description of the commit and the second message a more detailed description of what was changed
-
Example: Command Line Commit
git commit -m "Changed log file output" -m "Now when unit test fails, the error message {error_msg} is added to the log file. Changes made in files Logger.ts and app.component.ts
- Push your changes to remote repository.
- Create a pull request to merge changes to master branch.
- About pull requests
- Creating a pull request
- Link pull request with the issue it resolves with "fixes #{issue number}" somewhere in the pull request
- Example:
- Assign someone to review your pull request.
- Review the pull requests that are assigned to you.
- Accept merge if changes resolve the issue.
- Comment on the pull request if more changes are necessary.
- Resolve merge conflicts.
- Resolving conflicts on Github
- Resolving conflicts using command line
- You can also resolve them using your IDE/editor
- Pull changed from the remote to your machine
- git pull
- Updates the files on your device if someone else has pushed changed to the remote repository.
- Profit!!!
We are using the Hello World Tutorial from Angular.dev
-
IDE, like VS code
-
- check that your version of node is meets the requirements for angular
-
Install Angular CLI
- Run:
npm install -g @angular/cli.
- You can use any version of node and angular for this tutorial as long as it works. This isn't production code.
- Navigate to this repo's directory in your terminal
- It should already be there if you open the terminal in VS code from the folder
- Run
npm install
- Run
ng serve
- Go to
http://localhost:4200/
in your browser to see the webpage.
Note: If you get warnings during these steps, and npm audit fix
does not fix them, don't worry. It will probably still run.