diff --git a/diagrams_source/lab02/merging_topic_branches.svg b/diagrams_source/lab02/merging_topic_branches.svg index 914587f..8d6774f 100644 --- a/diagrams_source/lab02/merging_topic_branches.svg +++ b/diagrams_source/lab02/merging_topic_branches.svg @@ -7,9 +7,9 @@ xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" - width="913.94006mm" + width="913.94mm" height="304.23633mm" - viewBox="0 0 913.94006 304.23633" + viewBox="0 0 913.94 304.23633" version="1.1" id="svg8" inkscape:version="1.0.2 (e86c870879, 2021-01-15, custom)" @@ -18,61 +18,6 @@ id="defs2"> - - - - - - - - - - - - - + inkscape:snap-object-midpoints="true" + inkscape:snap-bbox="true" /> @@ -244,7 +106,7 @@ image/svg+xml - + @@ -252,1343 +114,1392 @@ inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1" - transform="translate(39.502106,174.44922)"> + transform="translate(39.502105,174.44922)"> - - - - - - Master - - - - - Topic - - - - - - - - + Team - - - - - Master - - - - - Topic - Team + + + Checkout master and pull to get team's recent changes - - Checkout master and pull to get team's recent changes + Step 1 - - - - - - - - - - - - - - - Master - Step 1 + Delete merged topic - - Step 4 - - - Currently checked out Checkout topic and merge master - - Step 2 - - - - - branch is indicated by a black border + + + + + + + + + + + + Topic + + + + + + Master - Merge - - - - - Team - - - - - Topic - - - - - - Master - - - - - Team - - - - - - - - - Topic - Result - - - - Step 3 - Master + + + + + Topic + Start + Checkout master and merge topic - - - - - We have an unmerged topic branch + + Checkout topic and merge master + Step 2 + + + + + Master + Merge + + + + + Team + + + + + Topic + + + + + + Master + + + + + Team + + + + + + + + + Topic + Result + + + + Step 3 + Checkout master and merge topic + + + + + Master - - - - - Master + Team - - - - - - - - - Topic - Merge - - - - - - - - - - - - - - Master - - - - - - - - - Topic - Team + + + + + + + + + + + Topic + Merge + + + + + + + + + + + + + + Master + + + + + + + Topic + Result - + style="stroke-width:0.264583">Result + + + + + + + + + + + + + + + + + + + + Master + Delete merged topic + Step 4 + + Master diff --git a/diagrams_source/lab02/merging_topic_branches_opt.svg b/diagrams_source/lab02/merging_topic_branches_opt.svg new file mode 100644 index 0000000..e4afd15 --- /dev/null +++ b/diagrams_source/lab02/merging_topic_branches_opt.svg @@ -0,0 +1 @@ +TeamCheckout master and pull to get team's recent changesStep 1Currently checked out branch is indicated by a black borderTopicMasterTopicStartWe have an unmerged topic branch Checkout topic and merge masterStep 2MasterMergeTeamTopicMasterTeamTopicResultStep 3Checkout master and merge topicMasterTeamTopicMergeMasterTopicResultMasterDelete merged topicStep 4Master diff --git a/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg b/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg index 914587f..e4afd15 100644 --- a/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg +++ b/tiddlers/content/labs/lab02/_Labs_02_images_Merging Topic Branches.svg @@ -1,1594 +1 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - Master - - - - - Topic - - - - - - - - Team - - - - - Master - - - - - Topic - Checkout master and pull to get team's recent changes - - Step 1 - - - - - - - - - - - - - - - Master - Delete merged topic - - Step 4 - - - Checkout topic and merge master - - Step 2 - - - - - Master - Merge - - - - - Team - - - - - Topic - - - - - - Master - - - - - Team - - - - - - - - - Topic - Result - - - - Step 3 - Checkout master and merge topic - - - - - Master - - - - - Team - - - - - - - - - Topic - Merge - - - - - - - - - - - - - - Master - - - - - - - - - Topic - Result - - - +TeamCheckout master and pull to get team's recent changesStep 1Currently checked out branch is indicated by a black borderTopicMasterTopicStartWe have an unmerged topic branch Checkout topic and merge masterStep 2MasterMergeTeamTopicMasterTeamTopicResultStep 3Checkout master and merge topicMasterTeamTopicMergeMasterTopicResultMasterDelete merged topicStep 4Master