edit-task

Task Description: FAQ - list of questions that came up over the course of this course

Start Date:

Start Time:

Duration:

Priority:

Status: To Do Completed In Process

Add Photo:

Owner ID:

Content: use HTML Edit Content <h1 style="text-align: center;">FAQ</h1> <h2 style="text-align: center;">learn git</h2> <h2>[previously questions]</h2> <ol> <li><strong>[2014-03-dd] not sure on how to push local file to github (remote repository)</strong><ol> <li>] git push -u origin master</li> </ol></li> <li><strong>[2014-03-dd] working directory vs repository(repo)</strong></li> <ol> <li>] repository - is where files reside, create dir, <strong>] use git init to create a repository </strong></li> <li>] working directory - is local copy of repository files, <strong>] use git clone to create a ( working directory/checkout a repository)</strong></li> <li>] <a href="http://stackoverflow.com/questions/5284449/where-is-the-git-working-directory" target="_blank">http://stackoverflow.com/questions/5284449/where-is-the-git-working-directory</a> - answer below accepted answer</li> </ol> <li><strong>[2014-03-dd] work locally - ex add files from my system to my repo</strong></li> <ol> <li>] you can drag and drop files using the local filesystem into a local 'repo' directory // project working directory</li> <li>] show up in git status, but</li> <li>] they are NOT part of the project, until you git ADD, and then git commit</li> </ol> <li><strong>[2014-03-dd] synching local + remote - how to - after changes on 1 or the other</strong></li> <ol> <li>] ex - github has 1 file(readme), which is not in local, local has 1 index file NOT in remote, how would I synch the 2 projects so that they both contain the same files</li> </ol> <li><strong>[2014-03-dd] PRB - githhub -&nbsp;while it has "gitpages" for hosting demos/</strong><ol> <li>] it aint gonna work for .cshtml files, becauses it's likely only&nbsp;&nbsp;gonna be running on 'nix servers,</li> </ol></li> <li><strong>[2014-03-dd]</strong><strong> first question - re multi developer synching process</strong><ol> <li>] ex dev 1 .... n -</li> <li>] each dev pulls down 'copy 1.000' of project,</li> <li>] dev 1 completed PRB-FIX-###, then commits files to "github", (the project ver# would now be 1.001)</li> <li>] dev 2 completes NEW-FEA-### then commits files to ,</li> <li>] dev 3 completes UPD-FEA-### and is still working on it</li> <li>? WHERE dev 1 and dev 2, dev 3 is working on UPDATE-FEA-### and</li> <li>] REF <span style="text-decoration: underline;">doc</span></li> </ol></li> <li><strong>[2014-12-15] using git diff to compare changes in 2 different branches</strong></li> <ol> <li>] not sure that i really understand what its telling me</li> </ol> <li><strong>[2015-06-21] NEW task IN </strong></li> <ol> <li>] # # - CREATE-article# 4573 terms of endearment - git</li> </ol> <li><strong>[2015-06-22] NEW article IN BOOK prj-035/learning-git/introduction</strong></li> <ol> <li>x] # 4573 - <a href="/view/article?id=4573" target="_blank">terms of endearment - git</a></li> </ol></ol> <h2>[currently]</h2> <ol> <li>]</li> <li>]</li> </ol> <h2>[next - notes, tips, reminders, ...]</h2> <ol> <li><strong>] msft command prompt</strong></li> <ol> <li>] help command,</li> <li>] ex&nbsp;help cd&nbsp;</li> </ol> <li><strong>] VS GITBASH</strong></li> <ol> <li>] command --help</li> <li>] ex cd --help&nbsp;</li> </ol> <li><strong>] navigation</strong></li> <ol> <li>] use "My Documents" around directory names with spaces OR win short names</li> </ol> <li><strong>] src = etherpad.org - development workflow</strong></li> <ol> <li>] The main development happens on Github. <span style="background-color: #ffff99;">] To contribute,</span></li> <ol> <li>] fork the main repo,</li> <li>] branch off a feature branch from develop,</li> <li>] make your changes and commit them,</li> <li>] push to your fork and</li> <li>] submit a pull request for ether/develop.</li> </ol> <li>*] Once in a while <strong>we merge develop into master,</strong> which results in a new release.</li> <ol> <li>*] This means you will always find the latest stable version in the master branch.</li> </ol></ol> <li><strong>] git workflow &amp; gitflow</strong></li> <ol> <li>] git workflow cheat sheet</li> <li>] <a href="http://nvie.com/posts/a-successful-git-branching-model/">http://nvie.com/posts/a-successful-git-branching-model/</a>&nbsp;</li> <li>] <a href="https://www.atlassian.com/git/tutorials/comparing-workflows/" target="_blank">https://www.atlassian.com/git/tutorials/comparing-workflows/</a>&nbsp;</li> <li>] <a href="http://danielkummer.github.io/git-flow-cheatsheet/">http://danielkummer.github.io/git-flow-cheatsheet/</a>&nbsp;- tool for managing development workflow</li> </ol> <li><strong>] scenario 1, 2 developers working on the same project </strong></li> <ol> <li>] project - master v 1.0.0</li> <li>] project - develop v 1.0.0</li> <li>] devA - fork - develop, creates new branch "FIX-001"</li> <li>] devB - fork - develop, creates new branch "FEA-001"</li> </ol> <li><strong>] NEXT devA</strong></li> <ol> <li>] devA - finishes, submits "pull" request to develop</li> <li>] devA - creates, new branch of FIX-001, as FIX-002, continues coding || waits for PM to merge FIX001, then fork develop+fix-001, new branch fix-002</li> </ol> <li><strong>] NEXT project</strong></li> <ol> <li>] merge FIX-001 into develop,&nbsp; - wouldnt this potentially screw up devB (IF fix-001 modifies some of the&nbsp;files )</li> <li>]</li> </ol> <li>] other</li> </ol>