task

learn GIT

day# 6

[REFERENCE]

  1. ] # 2568 - overview git in technology-software/developer/source-code-managment
  2. ] # 4076 - overview git in project-035/planning/documentation
  3. ] # 4522 - create FAQ - about git - not really a FAq, more of a PAQ - Personally Asked
  4. ] # ### - ignore this

[previously]

  1. [2014-03-15] day# 1 - Git Started
    1. ] download and install git, ] configure git, ] create an ART overview git ]
  2. [2014-03-16] day# 2 - REVIEW VIDEO tutorial
    1. ] review tutorial, ] start MY prj-001, ] a few questions, ] abondoned lrn-git project ???
  3. [2014-12-07] day# 3 - RETURN to git, addED SCENARIO'S
    1. x] COMPLETE interactive tutorial on github to practice using git Bash CLI and learn me some git commands
    2. x] layed out some different use case scenario's for how 1 might be using git, see below ...
    3. [2014-12-07] SCENE 1 - you are CREATE a new local project
    4. [2014-12-07] SCENE 2 - you HAVE an existing local project
    5. [2014-12-07] SCENE 3 - you HAVE/WANT to work on an existing remote project, (clone to local, make changes, push to remote)
    6. [2014-12-07] SCENE 4 - GET(clone) an existing remote project for  inclusion into ...
  4. [2014-12-08] day# 4 - create repo, add remote repo, push repo to remote,
    1. +] SCENARIO - ADDing some component into your project
    2. x] forwarded in /NEXT items from previous days (1-3)
  5. [2014-12-08] day# 5 - create a branch, switch between branches, delete a branch
    1. x] what is a branch, creating a branch, making changes to your code within the branch, switching back to a different branch and

 

[currently]

  1. [2014-12-09] SCENE 1 - CREATE a new local project(contd) - UPDATE and MERGE
    1. ] Merge - After you have a branch, you've successfully developed some new feature/fix within your branch, your going to want to MERGE that branch of code into the MASTER branch.
  2. UPDATE] git pull
    1. ] to update your local repository to the newest commit, use git pull in your working directory to fetch and merge remote changes.
  3. MERGE] git merge <branch>
    1. ] to merge another branch into your active branch (e.g. master)
    2. ] in both of the above cases, git tries to auto-merge changes 
    3. ] Unfortunately, this is not always possible and results in conflicts. You are responsible to merge those conflicts manually by editing the files shown by git.
  4. CONFLICT] git add <filename>
    1. ] After changing, you need to mark them as merged
  5. CONFLICT] git diff <source_branch> <target_branch>
    1. ] before merging changes, you can also preview them
  6. ] SUMMARY
    1. ] UPDATE your local repo FROM the remote repo to ensure that you have the newest commits from the remote repository
    2. ] MERGE your branch into the master branch
    3. ] RESOLVE merge/pull conficts by git add ing the desired file
    4. ] USE git diff to compare the differences between files in a branch

[next]

  1. [2014-mm-dd] day# 7
    1. ] tagging and logging -  tag your commits with version#'s, use log to view the commit history of a project in the format that you desire
Details Photos Edit more

Details

ID: 4524

NAME: day-6-learn-git

DESCRIPTION: NEXT STEPS ] update (from remote repo) ] merge branches ] resolve merge conflicts

START DATE TIME: 2014-12-10 21:59:01

EST DURATION: 01:00:00

END DATE TIME: 2014-12-10 22:59:01

STATUS: Completed

PRIORITY: -5

OWNER ID: 75

Content Photos Edit more

photos

photos for this task

actions

Agenda Email task SMS task Priorities