📝 Made note on merging pull requests
This commit is contained in:
parent
c10b15767a
commit
422dbfca6c
1 changed files with 31 additions and 5 deletions
|
|
@ -83,6 +83,32 @@ git push origin_ssh main
|
|||
|
||||
It will then prompt you for your ssh key's passphrase, enter it and you will be good to go (better than the security token option above)
|
||||
|
||||
################### WORKING WITH OTHER CONTRIBUTORS ###################
|
||||
|
||||
# Adding an new branch
|
||||
git checkout -b new_branch
|
||||
|
||||
# Add new remote (often either a different website or fork of your project)
|
||||
git remote add new_remote <https://github.com/other_contributor/their_fork>
|
||||
|
||||
# From within the new_branch, pull the repository
|
||||
git pull new_remote their_branch_name
|
||||
|
||||
# Review the results using difft etc, once ready to merge, add, rm what is
|
||||
needed per usual git commands
|
||||
git add .
|
||||
git rm rm_file_1 rm_file_2
|
||||
git commit -m "merged changes contributed by other_contributor"
|
||||
|
||||
# Once done, switch back to your branch, merge the results and push to your
|
||||
repository
|
||||
|
||||
git checkout main
|
||||
git merge new_branch
|
||||
git push your_remote
|
||||
|
||||
# Note: This will automatically close the pull request on the repository, so if
|
||||
you need to message them regarding this, be sure to do so.
|
||||
|
||||
################### UPDATE NPM REGISTRY ###################
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue