task

FAQ

learn git

[previously questions]

1. [2014-03-dd] not sure on how to push local file to github (remote repository)
   1. ] git push -u origin master
2. [2014-03-dd] working directory vs repository(repo)
1. ] repository - is where files reside, create dir, ] use git init to create a repository
2. ] working directory - is local copy of repository files, ] use git clone to create a ( working directory/checkout a repository)
3. ] http://stackoverflow.com/questions/5284449/where-is-the-git-working-directory - answer below accepted answer
3. [2014-03-dd] work locally - ex add files from my system to my repo
1. ] you can drag and drop files using the local filesystem into a local 'repo' directory // project working directory
2. ] show up in git status, but
3. ] they are NOT part of the project, until you git ADD, and then git commit
4. [2014-03-dd] synching local + remote - how to - after changes on 1 or the other
1. ] 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
5. [2014-03-dd] PRB - githhub - while it has "gitpages" for hosting demos/
   1. ] it aint gonna work for .cshtml files, becauses it's likely only  gonna be running on 'nix servers,
6. [2014-03-dd] first question - re multi developer synching process
   1. ] ex dev 1 .... n -
   2. ] each dev pulls down 'copy 1.000' of project,
   3. ] dev 1 completed PRB-FIX-###, then commits files to "github", (the project ver# would now be 1.001)
   4. ] dev 2 completes NEW-FEA-### then commits files to ,
   5. ] dev 3 completes UPD-FEA-### and is still working on it
   6. ? WHERE dev 1 and dev 2, dev 3 is working on UPDATE-FEA-### and
   7. ] REF doc
7. [2014-12-15] using git diff to compare changes in 2 different branches
1. ] not sure that i really understand what its telling me
8. [2015-06-21] NEW task IN
1. ] # # - CREATE-article# 4573 terms of endearment - git
9. [2015-06-22] NEW article IN BOOK prj-035/learning-git/introduction
1. x] # 4573 - terms of endearment - git

[currently]

1. ]
2. ]

[next - notes, tips, reminders, ...]

1. ] msft command prompt
1. ] help command,
2. ] ex help cd 
2. ] VS GITBASH
1. ] command --help
2. ] ex cd --help 
3. ] navigation
1. ] use "My Documents" around directory names with spaces OR win short names
4. ] src = etherpad.org - development workflow
1. ] The main development happens on Github. ] To contribute,
1. ] fork the main repo,
2. ] branch off a feature branch from develop,
3. ] make your changes and commit them,
4. ] push to your fork and
5. ] submit a pull request for ether/develop.
2. *] Once in a while we merge develop into master, which results in a new release.
1. *] This means you will always find the latest stable version in the master branch.
5. ] git workflow & gitflow
1. ] git workflow cheat sheet
2. ] http://nvie.com/posts/a-successful-git-branching-model/ 
3. ] https://www.atlassian.com/git/tutorials/comparing-workflows/ 
4. ] http://danielkummer.github.io/git-flow-cheatsheet/ - tool for managing development workflow
6. ] scenario 1, 2 developers working on the same project
1. ] project - master v 1.0.0
2. ] project - develop v 1.0.0
3. ] devA - fork - develop, creates new branch "FIX-001"
4. ] devB - fork - develop, creates new branch "FEA-001"
7. ] NEXT devA
1. ] devA - finishes, submits "pull" request to develop
2. ] 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
8. ] NEXT project
1. ] merge FIX-001 into develop,  - wouldnt this potentially screw up devB (IF fix-001 modifies some of the files )
2. ]
9. ] other

Details

ID: 4522

NAME: CREATE-article

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

START DATE TIME: 2014-12-09 09:08:15

EST DURATION: 01:00:00

END DATE TIME: 2014-12-09 10:08:15

STATUS:

PRIORITY: -5

OWNER ID: 1

photos

actions

Agenda Email task SMS task Priorities