Cruisers Forum
 


Join CruisersForum Today

Reply
 
Thread Tools Rate Thread Display Modes
Old 25-08-2016, 14:01   #496
Registered User
 
rgleason's Avatar

Join Date: Mar 2012
Location: Boston, MA
Boat: 1981 Bristol 32 Sloop
Posts: 7,828
GIT WORKFLOW - Final, Summary

This is the workflow:

1. github.com/author/project (upstream)
2. Local PC github repository (git cloned)
- git fetch upstream
- git checkout master
- git merge upstream/master
3. github.com/yourname/project (origin) (forked from the author) to update your repos
-git push origin master

Now, regarding your own work. Always Always make a NEW BRANCH and work out of that. Then when you are ready,
- git checkout <the new branch>
- git push origin <the new branch>

Then from your github directory while in the project, find the new branch and make a Pull Request out of it.

This is what your remote should look like. Sean is the author, I just help occasionally when I can.

C:\Users\Rick\Documents\GitHub\o-plugin\s-weatherfax_pi>git remote -v
origin https://github.com/rgleason/weatherfax_pi.git (fetch)
origin https://github.com/rgleason/weatherfax_pi.git (push)
upstream git://github.com/seandepagnier/weatherfax_pi.git (fetch)
upstream git://github.com/seandepagnier/weatherfax_pi.git (push)
__________________

__________________
rgleason is offline   Reply With Quote
Reply

Tags
environment

Thread Tools
Display Modes Rate This Thread
Rate This Thread:

Posting Rules
You may not post new threads
You may not post replies
You may not post attachments
You may not edit your posts

BB code is On
Smilies are On
[IMG] code is On
HTML code is Off
Trackbacks are Off
Pingbacks are Off
Refbacks are Off



Our Communities

Our communities encompass many different hobbies and interests, but each one is built on friendly, intelligent membership.

» More about our Communities

Automotive Communities

Our Automotive communities encompass many different makes and models. From U.S. domestics to European Saloons.

» More about our Automotive Communities

Marine Communities

Our Marine websites focus on Cruising and Sailing Vessels, including forums and the largest cruising Wiki project on the web today.

» More about our Marine Communities


Copyright 2002- Social Knowledge, LLC All Rights Reserved.

All times are GMT -7. The time now is 12:29.


Google+
Powered by vBulletin® Version 3.8.8 Beta 1
Copyright ©2000 - 2017, vBulletin Solutions, Inc.
Social Knowledge Networks
Powered by vBulletin® Version 3.8.8 Beta 1
Copyright ©2000 - 2017, vBulletin Solutions, Inc.

ShowCase vBulletin Plugins by Drive Thru Online, Inc.