Merge branch 'BRAVO68WEB:main' into main

This commit is contained in:
Chirag Bhalotia 2022-02-01 01:16:19 +05:30 committed by GitHub
commit 39e7ee0dd2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions

View File

@ -45,10 +45,10 @@ You will see the benefits of adding remote later.
***
Open Source projects have a number of contributors who can push code anytime. So it is necessary to make your forked copy equal with the original repository. The remote added above called Upstream helps in this.
```$ git checkout master```
```$ git checkout main```
```$ git fetch upstream```
```$ git merge upstream/master```
```$ git push origin master```
```$ git merge upstream/main```
```$ git push origin main```
The last command pushes the latest code to your forked repository on Github. The origin is the remote pointing to your forked repository on github.
### CREATE A NEW BRANCH FOR A FEATURE OR BUGFIX -
@ -66,7 +66,7 @@ The first command adds all the files or you can add specific files by removing -
It can happen that your feature takes time to complete and other contributors are constantly pushing code. After completing the feature your feature branch should be rebase on latest changes to upstream master branch.
```$ git checkout <feature-branch>```
```$ git pull --rebase upstream master```
```$ git pull --rebase upstream main```
Now you get the latest commits from other contributors and check that your commits are compatible with the new commits. If there are any conflicts solve them.
### SQUASHING YOUR COMMITS-
@ -143,4 +143,4 @@ This is the list of _type_ of commits that we accept:
✔ If the participant is not able to contribute to the assigned issue due to any reason, kindly let the project leads know so that the issue is assigned to some other participant.
### Happy Coding 👩‍💻👩‍💻
### Happy Coding 👩‍💻👩‍💻