Skip to content

Commit

Permalink
chore: rebase with main (WEB-31)
Browse files Browse the repository at this point in the history
  • Loading branch information
climaxmba committed Mar 29, 2024
1 parent e7154c6 commit 2304dcb
Showing 1 changed file with 36 additions and 0 deletions.
36 changes: 36 additions & 0 deletions CONTRIBUTING.md
Original file line number Diff line number Diff line change
Expand Up @@ -111,3 +111,39 @@ git rebase main
### Force-push your changes

Run `git push --force` to update your remote branch and eventually, your pull request.

## When your Pull Request is merged

That's Great, your work is well appreciated! If you would like to keep contributing, you should update your fork and update your local repository.

## When your branch goes out of date

This often happens and is mostly encountered after a pull request opened by another individual is merged to the `main` branch. Here are steps to follow if this happens:

> You may choose to merge them the `main` branch on GitHub to your working branch which may be faster, but these steps are encouraged for a more linear-looking git history
### Update your Fork

1. Syncronize your Fork by going to your forked repository and ensure that you are on the `main` branch. You will see a message like { message }
2. Click { buttonName } and click **Update Branch** on the prompt that appears.

### Update your local repository

1. Open a terminal in the directory of your local repository and run `git checkout main` to ensure you are on the `main` branch.
2. Run this command to update your local repository, you can read more about `git pull` [here]().

```bash
git pull --rebase
```

3. Now checkout your working branch with `git checkout [branch_name]` and run:

```bash
git rebase main
```

4. You may run into a merge conflict. If you do, [here's how to resolve them](), you have to do that before preceeding.

### Force-push your changes

Run `git push --force` to update your remote branch and eventually, your pull request.

0 comments on commit 2304dcb

Please sign in to comment.