Creating Proper Pull Requests

In order for changes you have made to be added to redox, or other related projects, it is necessary to have someone review your changes, and merge them into the official repository.

This is done by preparing a feature branch, and submitting a merge request.

For small changes, it is sufficient to just submit a pull request. For larger changes, which may require planning or more extensive review, it is better to start by creating an issue. This provides a shared reference for proposed changes, and a place to collect discussion and feedback related to it.

The steps given below are for the main Redox project repository - submodules and other projects may vary, though most of the approach is the same.

Please note:

Once you have marked your MR as ready, don't add new commits.
If you need to add new commits mark the MR as draft again.

Preparing your branch

In an appropriate directory, e.g. ~/tryredox, clone the Redox repository to your computer using one of the following commands:

HTTPS:

git clone https://gitlab.redox-os.org/redox-os/redox.git --origin upstream --recursive

SSH:

git clone git@gitlab.redox-os.org:redox-os/redox.git --origin upstream --recursive

Use HTTPS if you don't know which one to use. (Recommended: learn about SSH if you don't want to have to login every time you push/pull!)
If you used bootstrap.sh (see Building Redox), the git clone was done for you and you can skip this step.

Change to the newly created redox directory and rebase to ensure you're using the latest changes:
```
cd redox
```
```
git rebase upstream master
```
You should have a fork of the repository on GitLab and a local copy on your computer. The local copy should have two remotes; upstream and origin, upstream should be set to the main repository and origin should be your fork. Log into Redox Gitlab and fork the Repository - look for the button in the upper right.
Add your fork to your list of git remotes with

HTTPS:

git remote add origin https://gitlab.redox-os.org/MY_USERNAME/redox.git

SSH:

git remote add origin git@gitlab.redox-os.org:MY_USERNAME/redox.git

Note: If you made an error in your git remote command, use git remote remove origin and try again.

Alternatively, if you already have a fork and copy of the repo, you can simply check to make sure you're up-to-date. Fetch the upstream, rebase with local commits, and update the submodules:
```
git fetch upstream master
```
```
git rebase upstream/master
```
```
git submodule update --recursive --init
```
Usually, when syncing your local copy with the master branch, you will want to rebase instead of merge. This is because it will create duplicate commits that don't actually do anything when merged into the master branch.
Before you start to make changes, you will want to create a separate branch, and keep the master branch of your fork identical to the main repository, so that you can compare your changes with the main branch and test out a more stable build if you need to. Create a separate branch:
```
git checkout -b MY_BRANCH
```
Make your changes and test them.
Commit:
```
git add . --all
```
```
git commit -m "COMMIT MESSAGE"
```
Commit messages should describe their changes in present-tense, e.g. "Add stuff to file.ext" instead of "added stuff to file.ext". Try to remove duplicate/merge commits from PRs as these clutter up history, and may make it hard to read.
Optionally run rustfmt on the files you changed and commit again if it did anything (check with git diff first).
Test your changes with make qemu or make virtualbox.

Pull from upstream:

git fetch upstream

git rebase upstream/master

Note: try not to use git pull, it is equivalent to doing git fetch upstream; git merge master upstream/master.

Repeat step 10 to make sure the rebase still builds and starts.
Push your changes to your fork:
```
git push origin MY_BRANCH
```

Submitting a merge request

On Redox GitLab, create a Merge Request, following the template. Describe your changes. Submit!
Once your merge request is ready, notify reviewers by sending the link to the Redox Merge Requests room.

Incorporating feedback

Sometimes a reviewer will request modifications. If changes are required:

Reply or add a thread to the original merge request notification in the Redox Merge Requests room indicating that you intend to make additional changes.

Note: It's best to avoid making large changes or additions to a merge request branch, but if necessary, please indicate in chat that you will be making significant changes.
Mark the merge request as "Draft" before pushing any changes to the branch being reviewed.
Make any necessary changes.
Reply on the same thread in the Redox Merge Requests room that your merge request is now ready.
Mark the merge request as "Ready"

This process communicates that the branch may be changing, and prevents reviewers from expending time and effort reviewing changes that are still in progress.

Using GitLab web interface

Open the repository that you want and click in "Web IDE".
Make your changes on repository files and click on "Source Control" button on the left side.
Name your commits and apply them to specific branches (each new branch will be based on the current master branch, that way you don't need to create forks and update them, just send the proper commits to the proper branches, it's recommended that each new branch is a different change, more easy to review and merge).
After the new branch creation a pop-up window will appear suggesting to create a MR, if you are ready, click on the "Create MR" button.
If you want to make more changes, finish them, return to the repository page and click on the "Branches" link.
Each branch will have a "Create merge request" button, click on the branches that you want to merge.
Name your MR and create (you can squash your commits after merge to not flood the upstream with commits)
If your merge request is ready, send the link on Redox Merge Requests room.

Remember that if you use forks on GitLab web interface you will need to update your forks manually in web interface (delete the fork/create a new fork if the upstream repository push commits from other contributors, if you don't do this, there's a chance that your merged commits will come in the next MR).

The Redox Operating System