edit-task
Home
Up
Delete
Task Name:
Task Description:
NEXT STEPS ] update (from remote repo) ] merge branches ] resolve merge conflicts
TaskGroup ID:
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;">learn GIT</h1> <h2 style="text-align: center;">day# 6</h2> <h2><strong>[REFERENCE] </strong></h2> <ol> <li>] # 2568 - <a href="/view/article?id=2568" target="_blank">overview git</a> in technology-software/developer/source-code-managment</li> <li>] # 4076 - <a href="/view/article?id=4076" target="_blank">overview git</a> in project-035/planning/documentation</li> <li>] # 4522 - <a href="/view/task?id=4522" target="_blank">create FAQ</a> - about git - not really a FAq, more of a PAQ - Personally Asked</li> <li>] <span style="background-color: #888888;"># ###</span> - ignore this</li> </ol> <h2>[previously]</h2> <ol> <li><strong>[2014-03-15] <a href="/view/task?id=3663" target="_blank">day# 1 - Git Started</a></strong></li> <ol> <li>] download and install git, ] configure git, ] create an ART overview git ]</li> </ol> <li><strong>[2014-03-16] <a href="/view/task?id=3672" target="_blank">day# 2 - REVIEW VIDEO tutorial</a></strong></li> <ol> <li>] review tutorial, ] start MY prj-001, ] a few questions, ] abondoned lrn-git project ???</li> </ol> <li><strong>[2014-12-07] <a href="/view/task?id=4477" target="_blank">day# 3 - RETURN to git, addED SCENARIO'S</a></strong></li> <ol> <li>x] COMPLETE <span style="text-decoration: underline;">interactive tutorial</span> on github to practice using git Bash CLI and learn me some git commands</li> <li>x] layed out some different use case scenario's for how 1 might be using git, see below ...</li> <li><span style="background-color: #ffff99;"><strong>[2014-12-07] SCENE 1 - you are CREATE a new local project </strong></span></li> <li><span style="background-color: #ffff99;"><strong>[2014-12-07] SCENE 2 - you HAVE an existing local project </strong></span></li> <li><span style="background-color: #ffff99;"><strong>[2014-12-07] SCENE</strong><strong> 3 - you HAVE/WANT to work on an existing remote project, (clone to local, make changes, push to remote)</strong></span></li> <li><span style="background-color: #ffff99;"><strong>[2014-12-07] SCENE</strong><strong> 4 - GET(clone) an existing remote project for inclusion into ...</strong></span></li> </ol> <li><strong>[2014-12-08] <a href="/view/task?id=3713" target="_blank">day# 4</a> - create repo, add remote repo, push repo to remote, </strong></li> <ol> <li>+] SCENARIO - ADDing some component into your project</li> <li>x] forwarded in /NEXT items from previous days (1-3)</li> </ol> <li><strong>[2014-12-08] </strong><a href="/view/task?id=4519" target="_blank"><strong>day# 5</strong></a><strong> - create a branch, switch between branches, delete a branch</strong></li> <ol> <li>x] what is a branch, creating a branch, making changes to your code within the branch, switching back to a different branch and</li> </ol></ol> <p> </p> <h2>[currently]</h2> <ol> <li><strong><span style="background-color: #ffff99;">[2014-12-09] SCENE 1 - CREATE a new local project(contd)</span> - UPDATE and MERGE</strong></li> <ol> <li><strong>] Merge -</strong> 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.</li> </ol> <li><strong>UPDATE] git pull</strong></li> <ol> <li>] to update your local repository to the newest commit, use git pull in your working directory to <em>fetch</em> and <em>merge</em> remote changes.</li> </ol> <li><strong>MERGE] git merge <branch></strong></li> <ol> <li>] to merge another branch into your active branch (e.g. master)</li> <li>] in both of the above cases, git tries to auto-merge changes </li> <li>] Unfortunately, this is not always possible and results in <strong>conflicts.</strong> You are responsible to merge those conflicts manually by editing the files shown by git.</li> </ol> <li><strong>CONFLICT] git add <filename></strong></li> <ol> <li>] After changing, you need to mark them as merged</li> </ol> <li><strong>CONFLICT] git diff <source_branch> <target_branch></strong></li> <ol> <li>] before merging changes, you can also preview them</li> </ol> <li><strong>] SUMMARY</strong></li> <ol> <li>] UPDATE your local repo FROM the remote repo to ensure that you have the newest commits from the remote repository</li> <li>] MERGE your branch into the master branch</li> <li>] RESOLVE merge/pull conficts by git add ing the desired file</li> <li>] USE git diff to compare the differences between files in a branch</li> </ol></ol> <h2>[next]</h2> <ol> <li><strong>[2014-mm-dd] <a href="/view/task?id=4540" target="_blank">day# 7</a></strong></li> <ol> <li>] 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</li> </ol></ol>