Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.

This document provides details on ACME development conventions and practices.

...

important -- Items colored in red mean they are important, and should not be ignored.

one time -- Items colored in green are commands to be issued once per machine.

repo once -- Items colored in orange are commands to be issued once per local repository.

...

Once you think development is finished on your projectbranch, you should push the project branch to the shared repository (a remote), and submit a pull request (PR) for the integration of your project into master. 

...

To make a PR: Once you have committed all your changes and pushed the branch to the shared repository, 

Go go to https://github.com/ACME-Climate/ACME/branches and find your branch.  Click on  "New pull request".

...

Using the "Assignee" menu, add the name of the designated Integrator for your component.  See Integrator Guide for a list.  This will start the code review and the process of moving this feature to master.  Your PR is not finished until it has been merged to master by the Integrator.


This document can be used to help with pull request related issues.

...

Before communicating with remotes, you might want to add or remove remotes. In order to add and remove remotes the git remote command can be used. The two uses are as follows:

git remote add remote-name protocol:address/to/repo # Creates a remote

 

git remote remove remote-name # Removes a remote

  

In order to communicate with remotes, there are three actions. pushpull, and fetch.

...