MozillaWiki

Open Design: Difference between revisions

Page Discussion

Open Design (view source)

Revision as of 02:33, 23 October 2015

157 bytes removed ,  23 October 2015
formatting
(formatting)
(formatting)
Line 110: Line 110:
:1. '''Open Github Desktop.'''
:1. '''Open Github Desktop.'''


:2. '''Go to ''Repository > Pull''.'''  
:2. '''Get latest files from the remote repo.'''  
::As other people work on and push files to the remote repo, your local repo will become out of sync with the remote repo.
::As other people work on and push files to the remote repo, your local repo will become out of sync with the remote repo. So you'll want to "pull" files from the remote repo before you push any changes.
::Before you push to Github, make sure you have the latest project files. When you "pull" from the remote repo, Github Desktop looks at the difference between files in your local repo and files on the remote repo. If there is a difference, Github Desktop copies them to your local repo when you go to ''Repository > Pull.''
::When you "pull" from the remote repo, Github Desktop looks at the difference between files in your local repo and files on the remote repo. If there is a difference, Github Desktop copies them to your local repo.
::[[File:repo pull.png|none|550px|Repo Pull]]
::There are 2 ways to do this in Github Desktop:
:::* Option 1: Go to ''Repository > Pull''.
::::[[File:repo pull.png|none|550px|Repo Pull]]
 
:::*Option 2: Click the "Sync" button in the upper left corner.
::::[[File:sync.png|none|550px|Sync]]  


:3. '''Confirm that your changes appear in your local repo.'''
:3. '''Confirm that your changes appear in your local repo.'''
Line 134: Line 139:
::[[File:commit info 2.png|none|550px|Commit]]
::[[File:commit info 2.png|none|550px|Commit]]


::The screen will update to show that there are no uncommitted changes.
::The screen will update to show that your changes were committed and there are no uncommitted changes.  
::[[File:committed.png|none|550px|Committed]]
::[[File:committed.png|none|550px|Committed]]


:7. '''Push to Github.'''  
:7. '''Push to Github.'''  
::Go to ''Repository>Push.'' This immediately sends your committed changes to the remote repo and creates a new version for each changed file.
::"Pushing" immediately sends your committed changes to the remote repo, and creates a new version for each changed file.
::Note changes.
::There are 2 ways to do this in Github Desktop:
::[[File:pushed.png|none|550px|Push to Github]]
:::* Option 1: Go to ''Repository > Push''.
::::[[File:push.png|none|550px|Repo Push]]


::If you switch to the History tab, you'll see your commit at the top of the history.
:::*Option 2: Click the "Sync" button in the upper left corner.
::[[File:pushed 2.png|none|550px|History tab]]
::::[[File:push sync.png|none|550px|Push Sync]]  


:8. '''Confirm your changes on Github.'''  
:8. '''Confirm your changes on Github.'''  
Line 150: Line 156:




''Tips:''
''Tip:''
* If you need to stop in the middle of Steps 2-7 and start over later, it's a good idea to start over again at Step 2. This helps ensure that you don’t overwrite someone else’s change to the same file.
* If you need to stop in the middle of Steps 2-7 and start over later, it's a good idea to start over again at Step 2. This helps ensure that you don’t overwrite someone else’s change to the same file.
* For now, please don't use Github's fork or pull request functionality. As we’re all learning how to use Github, we want to stick to basic Github commands for now - clone, pull, commit, push.
* Within the Github Desktop client, please don't use the ''Sync'' button, as well as the ''Publish/Unpublish'' options in the ''Branch'' menu. These do unexpected things that impact the remote repo.
<hr>


=== Gathering Feedback from Team and Collaborators ===
=== Gathering Feedback from Team and Collaborators ===
Ezoehunt
Confirmed users
195

edits

Retrieved from "https://wiki.mozilla.org/Special:MobileDiff/1102039"