Versions Compared

Key

  • This line was added.
  • This line was removed.
  • Formatting was changed.
Comment: add a rebase "never".

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.

...

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.

...

  • Never merge from master to your feature branch. (In normal development. See NeverMergeFromMaster below for more info.)
  • Never merge "next" to "master"
  • Never use "cherry-pick" on "next"
  • Never commit directly to "master" or "next".  Only use merge commits of branches.
  • Never rebase commits on your branch that you have pushed outside your local copy of the repo.

Working with Remote repositories

...

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.

...