Skip to content
Merged
Changes from 4 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions docs/contributing/FAQ.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ limitations under the License.
- [When should I use decimals in examples, benchmarks, and documentation, and when should I avoid them?](#decimal-usage)
- [How should I name my pull request?](#pr-naming)
- [How do I call the stdlib bot on my PR?](#stdlib-bot)
- [Why were many unrelated files automatically pushed to my PR when I committed my changes?](#auto-push)
- [Frequently used `make` commands](#freq-make-commands)
- [Other Links](#other-links)

Expand Down Expand Up @@ -290,6 +291,31 @@ Once you have created your PR, you can call the **stdlib-bot** to perform basic

To see other available bot commands, comment `/stdlib help` on your PR.

<a name="auto-push"></a>

## Why were many unrelated files automatically pushed to my PR when I committed my changes?

When you open a pull request or push changes to your feature branch, GitHub compares your feature branch against your `develop` branch and shows all the differences. If your feature branch contains outdated or extra changes, they will appear in the PR, even if they are unrelated to your work.

To fix this, ensure that your feature branch is based on your latest `develop` branch. You can do this by rebasing/merging your feature branch with the `develop` branch:

```bash
$ git checkout develop
$ git pull origin develop
$ git checkout feature-branch
$ git rebase develop # or git merge develop
```

After rebasing/merging, force-push your changes to the remote feature branch:

```bash
$ git push origin feature-branch --force
```

> If you want to learn more about rebasing/merging, you can refer to our [Git guide][git-guide].

Alternatively, you can call the **stdlib-bot** to merge changes from the `develop` branch into your PR. To do this, comment `/stdlib merge` on your PR.

<a name="freq-make-commands"></a>

## Frequently used `make` commands
Expand Down Expand Up @@ -355,6 +381,7 @@ For more `make` commands, refer to the [documentation][benchmark] on running ben
## Other Links:

- [Style Guide][style-guide]
- [Git Cheatsheet][git-guide]
- [Other make commands][make-commands]

<section class="links">
Expand All @@ -367,6 +394,8 @@ For more `make` commands, refer to the [documentation][benchmark] on running ben

[github-fork]: https://help.github.com/articles/fork-a-repo/

[git-guide]: https://github.com/stdlib-js/stdlib/blob/develop/docs/contributing/git_cheatsheet.md#integration

[development-guide]: https://github.com/stdlib-js/stdlib/blob/develop/docs/contributing/development.md

[contributing-guide]: https://github.com/stdlib-js/stdlib/blob/develop/CONTRIBUTING.md
Expand Down