From d6e3848bd42fb5d9fa681cf8f49eac80c15f7059 Mon Sep 17 00:00:00 2001 From: Shrill Shrestha <43284212+ShrillShrestha@users.noreply.github.com> Date: Fri, 16 Apr 2021 10:13:48 -0500 Subject: [PATCH] Update CONTRIBUTING.md Co-authored-by: Aitik Gupta --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index e5c48f7..9ab3870 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -23,7 +23,7 @@ If you are working on a pre-existing issue, let us know by assigning it to yours - Checkout to main branch and `git pull upstream main` - Checkout to the branch you were working on - Rebase it with the main branch with `git rebase main` - - If there is any conflicts while rebasing, resolve them, and continue the rebase + - If there are any conflicts while rebasing, resolve them locally, and continue the rebase - Test it locally - If everything is working as expected, push it to the origin - Make a PR to the main project