(public).sospep.events ~ view task ~ day-6-learn-git

<h1 style="text-align: center;">learn GIT</h1>
<h2 style="text-align: center;">day# 6</h2>
<h2>[REFERENCE] </h2>
<ol>
<li>] # 2568 - <a href="/view/article?id=2568" target="_blank">overview git</a>&nbsp;in technology-software/developer/source-code-managment</li>
<li>] # 4076 - <a href="/view/article?id=4076" target="_blank">overview git</a>&nbsp;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>] # ### - ignore this</li>
</ol>
<h2>[previously]</h2>
<ol>
<li>[2014-03-15] <a href="/view/task?id=3663" target="_blank">day#&nbsp;1 -&nbsp;Git Started</a></li>
<ol>
<li>] download and install git, ] configure git, ] create an ART overview git ]</li>
</ol>
<li>[2014-03-16] <a href="/view/task?id=3672" target="_blank">day#&nbsp;2 -&nbsp;REVIEW VIDEO tutorial</a></li>
<ol>
<li>] review tutorial, ] start MY prj-001, ] a few questions, ] abondoned lrn-git project&nbsp;???</li>
</ol>
<li>[2014-12-07] <a href="/view/task?id=4477" target="_blank">day# 3 -&nbsp;RETURN to git, addED SCENARIO'S</a></li>
<ol>
<li>x] COMPLETE interactive tutorial on github to practice using git Bash CLI&nbsp;and&nbsp;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>[2014-12-07]&nbsp;SCENE 1 -&nbsp;you are CREATE a new local project </li>
<li>[2014-12-07]&nbsp;SCENE&nbsp;2 - you HAVE an existing local project </li>
<li>[2014-12-07]&nbsp;SCENE&nbsp;3 - you HAVE/WANT to work&nbsp;on an existing remote project, (clone to local, make changes, push to remote)</li>
<li>[2014-12-07] SCENE&nbsp;4 -&nbsp;GET(clone) an existing remote project for &nbsp;inclusion into ...</li>
</ol>
<li>[2014-12-08] <a href="/view/task?id=3713" target="_blank">day# 4</a>&nbsp;- create repo, add remote repo, push repo to remote, </li>
<ol>
<li>+] SCENARIO -&nbsp;ADDing some component into your project</li>
<li>x] forwarded in /NEXT items from previous days (1-3)</li>
</ol>
<li>[2014-12-08] <a href="/view/task?id=4519" target="_blank">day# 5</a>&nbsp;- create a branch, switch between branches, delete a branch</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>
&nbsp;
<h2>[currently]</h2>
<ol>
<li>[2014-12-09]&nbsp;SCENE 1 -&nbsp;CREATE a new local project(contd) - UPDATE and MERGE</li>
<ol>
<li>] 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.</li>
</ol>
<li>UPDATE] git pull</li>
<ol>
<li>] to update your local repository to the newest commit, use git pull in your working directory to fetch and merge remote changes.</li>
</ol>
<li>MERGE] git merge &lt;branch&gt;</li>
<ol>
<li>] to merge another branch into your active branch (e.g. master)</li>
<li>] in both of the above&nbsp;cases, git tries to auto-merge changes&nbsp;</li>
<li>] 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.</li>
</ol>
<li>CONFLICT] git add &lt;filename&gt;</li>
<ol>
<li>] After changing, you need to mark them as merged</li>
</ol>
<li>CONFLICT] git diff &lt;source_branch&gt; &lt;target_branch&gt;</li>
<ol>
<li>] before merging changes, you can also preview them</li>
</ol>
<li>] SUMMARY</li>
<ol>
<li>] UPDATE your local repo FROM the remote repo&nbsp;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>]&nbsp;USE git diff&nbsp;to compare the differences between files in a branch</li>
</ol></ol>
<h2>[next]</h2>
<ol>
<li>[2014-mm-dd] <a href="/view/task?id=4540" target="_blank">day# 7</a></li>
<ol>
<li>] tagging and logging - &nbsp;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>

~ view task ~ TaskGroup] daily-summary FROM [ Plan] document IN [ calendars] prj-035-git-started