<map version="0.9.0">
<!-- To view this file, download free mind mapping software FreeMind from http://freemind.sourceforge.net -->
<node CREATED="1348894956418" ID="ID_1374841119" MODIFIED="1349062791790" TEXT="Git">
<node CREATED="1349062393920" ID="ID_156661674" MODIFIED="1349062398437" POSITION="right" TEXT="Git overview">
<node CREATED="1348894981198" ID="ID_1087710039" MODIFIED="1349062400553" TEXT="A distributed version contron system"/>
<node CREATED="1348895036741" ID="ID_1185744127" MODIFIED="1349062525640" TEXT="Everything in Git is checksummed before it is stored">
<node CREATED="1348897051518" ID="ID_31693427" MODIFIED="1348897065214" TEXT="And referred to by that checksum"/>
<node CREATED="1348897067390" ID="ID_1667712359" MODIFIED="1348897088139" TEXT="SHA-1 hash is the mechaism used for checksumming">
<node CREATED="1348897092036" ID="ID_1198113548" MODIFIED="1348897102456" TEXT="20 char string made for hex chars"/>
</node>
</node>
<node CREATED="1348897131392" ID="ID_1559415175" MODIFIED="1349062452829" TEXT="3 Sections">
<node CREATED="1348897135552" ID="ID_1425895378" MODIFIED="1348897149864" TEXT="3 main sections of any Git project"/>
<node CREATED="1348897151209" ID="ID_218771204" MODIFIED="1348897188863" TEXT="Working directory">
<node CREATED="1348897182014" ID="ID_1917034804" MODIFIED="1348897183338" TEXT="single checkout of one version of the project"/>
</node>
<node CREATED="1348897207184" ID="ID_1024183398" MODIFIED="1349062418886" TEXT="Staging area">
<node CREATED="1348897221655" ID="ID_462393088" MODIFIED="1348897222694" TEXT="A simple file"/>
<node CREATED="1348897223621" ID="ID_1592733049" MODIFIED="1348897234877" TEXT="generally inside Git directory"/>
<node CREATED="1348897253853" ID="ID_665218683" MODIFIED="1348897255813" TEXT="Stores information about what will go into your next commit"/>
</node>
<node CREATED="1348897279100" ID="ID_1912869566" MODIFIED="1348897281058" TEXT="Git directory">
<node CREATED="1348897308533" ID="ID_705443413" MODIFIED="1348897310761" TEXT="Git stores meta data and object database for the project"/>
</node>
</node>
<node CREATED="1348895045287" ID="ID_1798916268" MODIFIED="1349062404290" TEXT="3 states">
<node CREATED="1348895055133" ID="ID_594140923" MODIFIED="1348895070421" TEXT="3 main state that files can reside"/>
<node CREATED="1348895077544" ID="ID_839205572" MODIFIED="1349062405634" TEXT="modified">
<node CREATED="1348895086352" ID="ID_1848526801" MODIFIED="1348895095766" TEXT="changed the file,but not commited"/>
</node>
<node CREATED="1348895097857" ID="ID_987799516" MODIFIED="1349062406320" TEXT="staged">
<node CREATED="1348895125523" ID="ID_1154728511" MODIFIED="1348895164307" TEXT="marked a modified file in it&apos;s current version to go into next commit snapshot"/>
</node>
<node CREATED="1348895114199" ID="ID_64897244" MODIFIED="1349062406983" TEXT="committed">
<node CREATED="1348895242170" ID="ID_145261418" MODIFIED="1348895456946" TEXT="data is stroed in the local database"/>
</node>
</node>
<node CREATED="1348895736372" ID="ID_936637277" MODIFIED="1349062546930" TEXT="2 stages">
<node CREATED="1348895748722" ID="ID_1451788143" MODIFIED="1348902904377" TEXT="tracked">
<arrowlink COLOR="#ff6666" DESTINATION="ID_1798916268" ENDARROW="Default" ENDINCLINATION="-56;-39;" ID="Arrow_ID_1648412260" STARTARROW="None" STARTINCLINATION="-148;-10;"/>
<node CREATED="1348895757878" ID="ID_869977791" MODIFIED="1348895773190" TEXT="are files that were from last snapshot"/>
</node>
<node CREATED="1348895776317" ID="ID_773768138" MODIFIED="1348895780764" TEXT="un-tracked"/>
</node>
<node CREATED="1348895462523" ID="ID_563413865" MODIFIED="1348895471357" TEXT="Workflow">
<node CREATED="1348895474159" ID="ID_600147176" MODIFIED="1348895561403" TEXT="1. Modify files in working directory"/>
<node CREATED="1348895525840" ID="ID_756574557" MODIFIED="1348895552088" TEXT="2. Stage the files,adding snapshots of them to your staging area"/>
<node CREATED="1348895566579" ID="ID_366661618" MODIFIED="1348895634410" TEXT="3. Do a commit - which takes the files as they are in staging area and stores that snapshot permanently in Git directory"/>
</node>
</node>
<node CREATED="1348896211204" ID="ID_796236274" MODIFIED="1348896231797" POSITION="right" TEXT="Remote respositories">
<node CREATED="1348896234209" ID="ID_1023439092" MODIFIED="1348896245432" TEXT="checking the remote for existing repo">
<node CREATED="1348896247400" ID="ID_1743222125" MODIFIED="1348896254086" TEXT="$git remote -v"/>
</node>
<node CREATED="1348896263396" ID="ID_574294675" MODIFIED="1348896272652" TEXT="adding remote repos">
<node CREATED="1348896273637" ID="ID_1582039847" MODIFIED="1348896290808" TEXT="$git remote add [shortname][url of repo]"/>
<node CREATED="1348896293611" ID="ID_1048810116" MODIFIED="1348896323564" TEXT="This gives a right to fetch the git repo into local repo"/>
<node CREATED="1348896324660" ID="ID_1857825178" MODIFIED="1348896353871" TEXT="Ex: $git remote add pb git://github.com/akbar/myproj.git">
<node CREATED="1348896356300" ID="ID_1083157614" MODIFIED="1348896368009" TEXT="$git fetch pb"/>
</node>
</node>
<node CREATED="1348896374027" ID="ID_1493917145" MODIFIED="1348896388588" TEXT="Fetching and Pulling from remotes">
<node CREATED="1348896389571" ID="ID_1335634697" MODIFIED="1348896405317" TEXT="$git fetch [remote-name]"/>
<node CREATED="1348896406649" ID="ID_1409984396" MODIFIED="1348896431297" TEXT="fetch only pulls data to local repo - doesn&apos;t merge with working directory"/>
<node CREATED="1348896437164" ID="ID_1184832938" MODIFIED="1348896444690" TEXT="$git pull">
<node CREATED="1348896445796" ID="ID_1357761397" MODIFIED="1348896479087" TEXT="pull fectches the data merges with working copy/branch"/>
</node>
</node>
<node CREATED="1348896614656" ID="ID_1778870672" MODIFIED="1348896620904" TEXT="Pushing to remotes">
<node CREATED="1348896622770" ID="ID_1195175289" MODIFIED="1349058347992" TEXT="$git push [remote-name] [branch-name]"/>
</node>
<node CREATED="1348896808917" ID="ID_874343431" MODIFIED="1348896815005" TEXT="Inspecting remotes">
<node CREATED="1348896816212" ID="ID_721045230" MODIFIED="1348896826822" TEXT="$git remote show [remote-name]"/>
</node>
<node CREATED="1348896830424" ID="ID_863579988" MODIFIED="1348896843712" TEXT="Removing and renaming remotes">
<node CREATED="1348896844346" ID="ID_954144893" MODIFIED="1348896858179" TEXT="$git remote rename [old][new]"/>
<node CREATED="1348896859008" ID="ID_1799160383" MODIFIED="1348896868874" TEXT="$git remote rm [remote-name]"/>
</node>
<node CREATED="1349058387114" ID="ID_522509134" MODIFIED="1349058401050" TEXT="Removing branch on remote">
<node CREATED="1349058402476" ID="ID_958415814" MODIFIED="1349058436084" TEXT="$git push [remote-name] :[branch-name]"/>
</node>
</node>
<node CREATED="1348897567974" ID="ID_1302349310" MODIFIED="1348897578613" POSITION="left" TEXT="Setting up a Repository">
<node CREATED="1348897324660" ID="ID_632825425" MODIFIED="1349062676230" TEXT="First time Git Setup">
<node CREATED="1348897337671" ID="ID_686703564" MODIFIED="1348897338825" TEXT="Git comes with a tool called &apos;git config&apos;">
<node CREATED="1348897347676" ID="ID_1974137347" MODIFIED="1348897348818" TEXT="lets you set configuration variables"/>
</node>
<node CREATED="1348897363405" ID="ID_1778385326" MODIFIED="1348897365521" TEXT="The config vars are stored in 3 different places">
<node CREATED="1348897368079" ID="ID_1974686577" MODIFIED="1348897382049" TEXT="/etc/gitconfig">
<node CREATED="1348897402812" ID="ID_1151894762" MODIFIED="1348897404277" TEXT="contains values for every user on the system and  their respos"/>
<node CREATED="1348897418421" ID="ID_1316141692" MODIFIED="1348897420092" TEXT="to read/write from this file">
<node CREATED="1348897429996" ID="ID_1387083422" MODIFIED="1348897431791" TEXT="use &apos;git config --system ....&apos;"/>
</node>
</node>
<node CREATED="1348897383566" ID="ID_319216071" MODIFIED="1348897446631" TEXT="~/.gitconfig">
<node CREATED="1348897456252" ID="ID_1813070090" MODIFIED="1348897457489" TEXT="specific to user"/>
<node CREATED="1348897481122" ID="ID_811523642" MODIFIED="1348897482527" TEXT="to read/write to this file">
<node CREATED="1348897502704" ID="ID_1831878680" MODIFIED="1348897504075" TEXT="use &apos;git config --global ...&apos;"/>
</node>
</node>
<node CREATED="1348897526202" ID="ID_1286912143" MODIFIED="1348897528098" TEXT=".git/config">
<node CREATED="1348897537142" ID="ID_1383625813" MODIFIED="1348897538583" TEXT="specific to single respository"/>
</node>
</node>
</node>
<node CREATED="1348895804140" ID="ID_513990202" MODIFIED="1349062705044" TEXT="Ignoring Files">
<node CREATED="1348895876311" ID="ID_1685896493" MODIFIED="1348895883847" TEXT="files you dont want to add"/>
<node CREATED="1348895885214" ID="ID_154548978" MODIFIED="1348895895775" TEXT="or show as being untracked"/>
<node CREATED="1348895897904" ID="ID_91676632" MODIFIED="1348895908604" TEXT=".gitignore file">
<node CREATED="1348895909838" ID="ID_1199042121" MODIFIED="1348895924831" TEXT="blank lines are ignored"/>
<node CREATED="1348895925367" ID="ID_777676062" MODIFIED="1348895934791" TEXT="lines with # are ignored"/>
<node CREATED="1348895935773" ID="ID_617554698" MODIFIED="1348895964281" TEXT="standard glob patterns work"/>
<node CREATED="1348895966192" ID="ID_1288138936" MODIFIED="1348895983486" TEXT="patterns ending with / indicate folder"/>
<node CREATED="1348896055419" ID="ID_1093142079" MODIFIED="1348896068719" TEXT="! - to negate a pattern"/>
</node>
</node>
<node CREATED="1348897580852" ID="ID_835347341" MODIFIED="1349062612260" TEXT="Add a project to a Git repo">
<node CREATED="1348897596495" ID="ID_1880531425" MODIFIED="1348897597695" TEXT="initializing a repo in existing folder">
<node CREATED="1348897617588" ID="ID_1147963432" MODIFIED="1348897620691" TEXT="$git init">
<node CREATED="1348897641908" ID="ID_800578362" MODIFIED="1348897643059" TEXT="creates a.git directory"/>
<node CREATED="1348897654757" ID="ID_1125785612" MODIFIED="1348897656021" TEXT="nothing is tracked yet (until the first commit)"/>
</node>
<node CREATED="1348897682485" ID="ID_1365392068" MODIFIED="1348897684002" TEXT="Adding files to git">
<node CREATED="1348897695677" ID="ID_317042501" MODIFIED="1348897696874" TEXT="$git add *.c"/>
<node CREATED="1348897697921" ID="ID_360448455" MODIFIED="1349062625370" TEXT="$git add README"/>
<node CREATED="1348897722472" ID="ID_389811560" MODIFIED="1348897723618" TEXT="$git commit -m &apos;initial project version&apos;"/>
</node>
</node>
</node>
<node CREATED="1348897734538" ID="ID_1875381328" MODIFIED="1348897750743" TEXT="Clone an existing Git repo(from other server)">
<node CREATED="1348897758919" ID="ID_501582926" MODIFIED="1348897760326" TEXT="$git clone git://github.com/akbar/proj.git">
<node CREATED="1348897773048" ID="ID_1235006034" MODIFIED="1348897774289" TEXT="creates a directory /proj"/>
<node CREATED="1348897781664" ID="ID_1464166044" MODIFIED="1348897782181" TEXT="Also checks out a working copy"/>
</node>
</node>
</node>
<node CREATED="1348897809058" ID="ID_943335854" MODIFIED="1348897810249" POSITION="left" TEXT="Checking the Status of files">
<node CREATED="1348897817787" ID="ID_291623338" MODIFIED="1348897818833" TEXT="$git status"/>
<node CREATED="1348897831749" ID="ID_521403289" MODIFIED="1348897832857" TEXT="tracking new files">
<node CREATED="1348897846389" ID="ID_1718558153" MODIFIED="1348902943816" TEXT="$git add FILENAME "/>
</node>
<node CREATED="1348897860453" ID="ID_1129421135" MODIFIED="1348902943816" TEXT="staging changed files">
<arrowlink COLOR="#ff00ff" DESTINATION="ID_1718558153" ENDARROW="Default" ENDINCLINATION="-5;-15;" ID="Arrow_ID_35380656" STARTARROW="None" STARTINCLINATION="94;-69;"/>
</node>
<node CREATED="1348897883667" ID="ID_929834331" MODIFIED="1348897884945" TEXT="Viewing staged and unstaged changes">
<node CREATED="1348897940152" ID="ID_1835584883" MODIFIED="1348897949428" TEXT="$git status is too vague"/>
<node CREATED="1348897934897" ID="ID_430189026" MODIFIED="1348897938813" TEXT="use $git diff"/>
<node CREATED="1348897964410" ID="ID_842955560" MODIFIED="1348897965548" TEXT="To see whats changed but not staged">
<node CREATED="1348897976108" ID="ID_1337854574" MODIFIED="1348897978033" TEXT="use $git diff"/>
</node>
<node CREATED="1348897992488" ID="ID_1446393043" MODIFIED="1348897993891" TEXT="To see whats staged and going into commit">
<node CREATED="1348898013629" ID="ID_1409525227" MODIFIED="1348898014724" TEXT="use $git diff --cached"/>
<node CREATED="1348898022080" ID="ID_1712762451" MODIFIED="1348898024016" TEXT="or use (&gt;1.6.1) $git diff --staged"/>
</node>
</node>
</node>
<node CREATED="1348896075114" ID="ID_444464576" MODIFIED="1349062734189" POSITION="left" TEXT="Viewing commit history">
<node CREATED="1348896121938" ID="ID_1671053012" MODIFIED="1348896128028" TEXT="$git log"/>
</node>
<node CREATED="1348898192967" ID="ID_1981301761" MODIFIED="1348898202100" POSITION="left" TEXT="Committing your changes">
<node CREATED="1348898209936" ID="ID_1411084995" MODIFIED="1348898210983" TEXT="$git commit"/>
<node CREATED="1348898220815" ID="ID_88968093" MODIFIED="1348898222136" TEXT="Skipping staging area">
<node CREATED="1348898235330" ID="ID_1635154214" MODIFIED="1348898236712" TEXT="$git commit -a"/>
</node>
<node CREATED="1348898284333" ID="ID_689557760" MODIFIED="1348898285616" TEXT="Removing files">
<node CREATED="1348898295754" ID="ID_596609681" MODIFIED="1348898296902" TEXT="$git rm FILENAME">
<node CREATED="1348898306531" ID="ID_1011533512" MODIFIED="1348898307744" TEXT="removes it from Stage and working copy"/>
</node>
<node CREATED="1348898314985" ID="ID_1622124860" MODIFIED="1348898316011" TEXT="$rm FILENAME">
<node CREATED="1348898326170" ID="ID_299304636" MODIFIED="1348898327260" TEXT="removes it in working dirctory"/>
<node CREATED="1348898334591" ID="ID_828948493" MODIFIED="1348898335444" TEXT="needs to be staged and committed"/>
</node>
<node CREATED="1348898359600" ID="ID_903718576" MODIFIED="1348898360553" TEXT="a scenario">
<node CREATED="1348898372524" ID="ID_1214272345" MODIFIED="1348898374158" TEXT="If you make changes to a file and don&apos;t stage and want to delete">
<node CREATED="1348898383807" ID="ID_1460915348" MODIFIED="1348898385279" TEXT="use $git rm FILENAME -f"/>
</node>
</node>
<node CREATED="1348898501877" ID="ID_1059257431" MODIFIED="1348898502791" TEXT="Removing it only from stage">
<node CREATED="1348898618445" ID="ID_1605631672" MODIFIED="1348898619647" TEXT="$git rm --cached FILENAME"/>
</node>
</node>
<node CREATED="1348898633688" ID="ID_1773298403" MODIFIED="1348898638323" TEXT="Moving files">
<node CREATED="1348902260953" ID="ID_837731006" MODIFIED="1348902278449" TEXT="Git doesn&apos;t track file movement"/>
<node CREATED="1348902279925" ID="ID_1353744023" MODIFIED="1348902287779" TEXT="If you rename a file">
<node CREATED="1348902296003" ID="ID_887575329" MODIFIED="1348902309206" TEXT="no meta data is stored in Git to captrue that"/>
</node>
<node CREATED="1348902313265" ID="ID_763761470" MODIFIED="1348902318539" TEXT="command">
<node CREATED="1348902321072" ID="ID_1559711695" MODIFIED="1348902329468" TEXT="$git mv file_from file_to"/>
</node>
</node>
</node>
<node CREATED="1348902335399" ID="ID_622218459" MODIFIED="1348902340067" POSITION="left" TEXT="Undoing things">
<node CREATED="1348902342599" ID="ID_72240135" MODIFIED="1348902349944" TEXT="changing your last commit">
<node CREATED="1348902352318" ID="ID_1866472607" MODIFIED="1348902365000" TEXT="$git commit --amend"/>
<node CREATED="1348902366344" ID="ID_1741906471" MODIFIED="1348902388390" TEXT="takes staging area and used for commit"/>
<node CREATED="1348902389869" ID="ID_1221012967" MODIFIED="1348902399865" TEXT="snapshot will look exactly the same"/>
</node>
<node CREATED="1348902404853" ID="ID_1496620031" MODIFIED="1348902417995" TEXT="unstaging a staged file">
<node CREATED="1348902419271" ID="ID_1279237626" MODIFIED="1348902438328" TEXT="$git reset HEAD filename"/>
</node>
<node CREATED="1348902442081" ID="ID_1087917311" MODIFIED="1348902451254" TEXT="Unmodifying a modified file">
<node CREATED="1348902453291" ID="ID_332865457" MODIFIED="1348902463135" TEXT="$git checkout -- filename"/>
<node CREATED="1348902466013" ID="ID_258689068" MODIFIED="1348902488167" TEXT="be careful - you modified working copy changes would be lost"/>
</node>
</node>
<node CREATED="1348902492471" ID="ID_1944068603" MODIFIED="1348902495087" POSITION="left" TEXT="Tagging">
<node CREATED="1348902496231" ID="ID_1731565375" MODIFIED="1348902505082" TEXT="Listing your tags">
<node CREATED="1348902525434" ID="ID_1399891450" MODIFIED="1348902536901" TEXT="$git tag "/>
<node CREATED="1348902537821" ID="ID_1733340326" MODIFIED="1348902552988" TEXT="$git tag -l v1.4.2(searches)"/>
</node>
<node CREATED="1348902556194" ID="ID_1766994725" MODIFIED="1348902562667" TEXT="Creating Tags">
<node CREATED="1348902567109" ID="ID_1043402134" MODIFIED="1348902580843" TEXT="2 types of tags">
<node CREATED="1348902588351" ID="ID_62399609" MODIFIED="1348902592651" TEXT="lightweight">
<node CREATED="1348902594333" ID="ID_1721070330" MODIFIED="1348902607967" TEXT="like a branch that doesn&apos;t change"/>
<node CREATED="1348902610228" ID="ID_1057622385" MODIFIED="1348902624990" TEXT="a pointer to a specific commit"/>
</node>
<node CREATED="1348902627009" ID="ID_1948820752" MODIFIED="1348902630136" TEXT="annotated">
<node CREATED="1348902637415" ID="ID_300352380" MODIFIED="1348902651636" TEXT="stored as full objects in GIt database"/>
<node CREATED="1348902652889" ID="ID_1053453007" MODIFIED="1348902662223" TEXT="check-summed"/>
<node CREATED="1348902663039" ID="ID_1693680488" MODIFIED="1348902670894" TEXT="contains tagger name"/>
<node CREATED="1348902671459" ID="ID_1470044279" MODIFIED="1348902673201" TEXT="email"/>
<node CREATED="1348902673747" ID="ID_1425918594" MODIFIED="1348902674903" TEXT="data"/>
<node CREATED="1348902675594" ID="ID_772964548" MODIFIED="1348902682737" TEXT="have a tagging message"/>
<node CREATED="1348902683116" ID="ID_1615635467" MODIFIED="1348902693035" TEXT="can be signed with GPG"/>
<node CREATED="1348902701177" ID="ID_728955778" MODIFIED="1348902703787" TEXT="creating">
<node CREATED="1348902704631" ID="ID_605007696" MODIFIED="1348902721884" TEXT="$git tag -a v1.4 -m &quot;my version 1.4&quot;"/>
</node>
</node>
</node>
</node>
<node CREATED="1348902727314" ID="ID_8381293" MODIFIED="1348902739487" TEXT="$git show [tag-name]"/>
</node>
<node CREATED="1349056808833" ID="ID_1555010752" MODIFIED="1349056859125" POSITION="right" TEXT="Branching">
<node CREATED="1349057017365" ID="ID_1834524628" MODIFIED="1349057027122" TEXT="master is the default branch name"/>
<node CREATED="1349057080909" ID="ID_548481993" MODIFIED="1349057096363" TEXT="HEAD is a pointer to the local branch you&#x2019;re currently on"/>
<node CREATED="1349058071342" ID="ID_1699832775" MODIFIED="1349058078822" TEXT="basic branching">
<node CREATED="1349056893348" ID="ID_785097959" MODIFIED="1349058081349" TEXT="create a new branch">
<node CREATED="1349056908873" ID="ID_648655414" MODIFIED="1349056932660" TEXT="$git branch [branch-name]"/>
<node CREATED="1349059838184" ID="ID_308365266" MODIFIED="1349059857354" TEXT="create a new branch from a previous commit">
<node CREATED="1349059821599" ID="ID_955765332" MODIFIED="1349059869914" TEXT="$git branch branchname &lt;sha1-of-commit&gt;"/>
</node>
</node>
<node CREATED="1349056955143" ID="ID_963706155" MODIFIED="1349058088092" TEXT="switch branch">
<node CREATED="1349056968848" ID="ID_340989336" MODIFIED="1349056979857" TEXT="$git checkout [branch-name]"/>
</node>
<node CREATED="1349057226152" ID="ID_10214498" MODIFIED="1349058092204" TEXT="create a new branch and switch to it">
<node CREATED="1349057262667" ID="ID_842046307" MODIFIED="1349057274381" TEXT="$git checkout -b [branch-name]"/>
</node>
<node CREATED="1349057310723" ID="ID_1532722021" MODIFIED="1349058095589" TEXT="delete a branch">
<node CREATED="1349057316171" ID="ID_740264933" MODIFIED="1349057327590" TEXT="$git branch -d [branch-name]"/>
</node>
<node CREATED="1349058128029" ID="ID_1949176783" MODIFIED="1349058207152" TEXT="show merged branches">
<node CREATED="1349058160602" ID="ID_1730670611" MODIFIED="1349058164838" TEXT="$git branch --merged"/>
</node>
<node CREATED="1349058176837" ID="ID_1198203710" MODIFIED="1349058195275" TEXT="show unmerged branches">
<node CREATED="1349058202272" ID="ID_1866920824" MODIFIED="1349058205749" TEXT="$git branch --no-merged"/>
</node>
</node>
<node CREATED="1348987505892" ID="ID_1124528579" MODIFIED="1349057438540" TEXT="Rebasing branches">
<node CREATED="1349056667331" ID="ID_438165444" MODIFIED="1349056674586" TEXT="$git merge">
<node CREATED="1349057487731" ID="ID_1919578002" MODIFIED="1349057490881" TEXT="three-way merge">
<node CREATED="1349057492099" ID="ID_940752446" MODIFIED="1349057533465" TEXT="two snapshots pointed to by the branch tips and the common ancester"/>
<node CREATED="1349057592801" ID="ID_1668872530" MODIFIED="1349057670320" TEXT="result: ">
<node CREATED="1349057671503" ID="ID_1320684665" MODIFIED="1349057672649" TEXT="creates a new snapshot,and a new commit point to it"/>
<node CREATED="1349057673227" ID="ID_1620580694" MODIFIED="1349057713820" TEXT="the snapshot(commit) have 2 parents"/>
</node>
</node>
<node CREATED="1349057797383" ID="ID_671049192" MODIFIED="1349057812057" TEXT="Merge Conflicts">
<node CREATED="1349057812557" ID="ID_1119569341" MODIFIED="1349057821402" TEXT="show conficts">
<node CREATED="1349057822428" ID="ID_1636431315" MODIFIED="1349057829992" TEXT="$git status"/>
<node CREATED="1349057843704" ID="ID_424481143" MODIFIED="1349057854850" TEXT="listed as unmerged"/>
</node>
<node CREATED="1349057983681" ID="ID_1202708166" MODIFIED="1349057996529" TEXT="show conficts with visual tool">
<node CREATED="1349057929905" ID="ID_704248925" MODIFIED="1349057998522" TEXT="$git mergetool"/>
</node>
</node>
</node>
<node CREATED="1349058533716" ID="ID_799935259" MODIFIED="1349058542482" TEXT="$git rebase">
<node CREATED="1349058626122" ID="ID_988768806" MODIFIED="1349058655404" TEXT="makes for a cleaner history than $git merge"/>
<node CREATED="1349058679516" ID="ID_1877223210" MODIFIED="1349058693992" TEXT="$git the same result with $git merge"/>
</node>
</node>
</node>
</node>
</map>
