Skip to content

Commit 5bf6074

Browse files
docs(contribution-guide): add pre-PR steps for conflict free merging (#7773)
* docs(contribution-guide): add pre-PR steps for conflict free merging
1 parent c03ec44 commit 5bf6074

1 file changed

Lines changed: 4 additions & 0 deletions

File tree

.github/CONTRIBUTING.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,6 +81,9 @@ After getting some feedback, push to your fork branch and submit a pull request.
8181
suggest some changes or improvements or alternatives, but for small changes your pull
8282
request should be accepted and merged fairly quick.
8383

84+
> Before submitting a pull request, ensure your feature branch is up to date with the latest changes from the upstream `main` branch to avoid conflicts during review.
85+
> You can go through this article to learn about [rebase technique][14]
86+
8487
Issue the PR to the [main][8] branch.
8588

8689
> See [GitHub documentation][9] for more help.
@@ -126,3 +129,4 @@ any time spent fixing typos or clarifying sections in the documentation.
126129
[10]: http://conventionalcommits.org/
127130
[11]: https://github.com/conventional-changelog/standard-version
128131
[13]: https://yarnpkg.com/lang/en/docs/install
132+
[14]: https://dev.to/matks/what-it-means-to-rebase-a-pull-request-submitted-on-github-5717

0 commit comments

Comments
 (0)