search

Ihmoda / github-protocol

0 stars 2 forks source link

1b. [1] Decide on top maintainer for Repo #117

Open katiash opened 6 years ago

katiash commented 6 years ago

➤ Jinal Patel commented:

Steps to follow for a Zero conflict Merges (Never push to Master) git pull This should be done on the master branch to get the latest changes first. git branch git checkout git push origin This is done to backup the changes on the GitHub. If you see any issues then you go to step 5 else step 6. git pull Clear all the conflicts and go to Step 4. On GitHub create a New Pull Request. The admin would Merge the Pull request if there are not conflicts. git checkout master git pull This will get all your changes and the changes on the master GitHub onto your local master

katiash commented 6 years ago

➤ ryangkistner@gmail.com commented:

Ryan is maintainer