Megaphone Commons

# PRs/MRs on CiviCRM

PR stands for "pull request" while MR means "merge request".

### Basic PR Process

1. Fork the repository in question (usually either on GitHub or GitLab)

1. Clone the repo by copying the ssh key from the repo and running the `git clone (*ssh key*)` on the command line

1. Add a remote repo with `git remote add (*name of remote*) (*branch name*)`

1. Push the remote repo with `git push (*name of remote*) (*branch name*)`

1. Add changed files (`git add (*name of files*)`

1. Commit staged files (`git commit -m ""`) with a message to describe the commit within the quotes

1. Push the committed files (`git push`)

1. click on the link the is provided in the terminal

1. fill out the info to on the browser page to make the PR

### Cherry-picked PR

Use this when you want to *cherry-pick* a specific commit for a PR

1. `git branch`

1. `git checkout (*name of branch with desired commit*)`

1. `git log`

1. copy the commit id of the desired commit

1. `git branch`

1. `git checkout master`

1. `git checkout -b (*new branch name*)`

1. `git cherry-pick (*commit id*)`

1. `git log`

1. `git push (*name of remote*) (*new branch name*)

1. click on the link the is provided in the terminal

1. fill out the info to on the browser page to make the PR

### PRs on CiviCRM Release Canidates (RC)

1. `git check out (*name of RC branch*)`

1. `git check out (*the new branch that you made edits in*)`

1. `git add` the changed files

1. `git push` branch to upstream

1. open the link that shows in the terminal after the last command is run to create a pull request

1. change the ***base*** of the repo you are merging into to be release candidate for CiviCRM