@@ -38,7 +38,7 @@ to be the SHA-1 of your last commit).
3838
3939### Simple Case
4040
41- ![ ] ( ../artwork/diagrams/branches1.eps )
41+ ![ ] ( ../artwork/diagrams/branches1.svg )
4242
4343Now,
4444let's see how Git handles branching,
@@ -54,7 +54,7 @@ We create a new branch called `experiment` off of our main branch,
5454which is by convention called ` master ` .
5555We then switch to the new branch and create a few commits.
5656
57- ![ ] ( ../artwork/diagrams/branch-story1.eps )
57+ ![ ] ( ../artwork/diagrams/branch-story1.svg )
5858
5959Then,
6060our boss comes in and says we need a hot fix to production.
@@ -64,7 +64,7 @@ push the release and then tag the new commit with the release number.
6464Then we go back to our ` experiment ` branch,
6565continue working and commit again.
6666
67- ![ ] ( ../artwork/diagrams/branch-story2.eps )
67+ ![ ] ( ../artwork/diagrams/branch-story2.svg )
6868
6969At this point,
7070we show the new branch code to our co-workers
@@ -74,7 +74,7 @@ so we merge the changes and delete our `experiment` branch.
7474
7575Our history of commit objects now looks like this:
7676
77- ![ ] ( ../artwork/diagrams/branch-story3.eps )
77+ ![ ] ( ../artwork/diagrams/branch-story3.svg )
7878
7979### Remotes
8080
@@ -96,7 +96,7 @@ one to `origin/master` which points to where the master branch was
9696on the person's repository you cloned from when you did so,
9797and a ` master ` branch that points to the most recent local commit.
9898
99- ![ ] ( ../artwork/diagrams/remote-story1.eps )
99+ ![ ] ( ../artwork/diagrams/remote-story1.svg )
100100
101101Now let's say you run a ` fetch ` .
102102A fetch pulls all the refs and objects that you don't already have
@@ -113,15 +113,15 @@ and they named the branch `idea` locally,
113113then pushed that branch.
114114We now have access to those changes as ` origin/idea ` .
115115
116- ![ ] ( ../artwork/diagrams/remote-story2.eps )
116+ ![ ] ( ../artwork/diagrams/remote-story2.svg )
117117
118118We look at the ` idea ` branch and like where they're going with it,
119119but we also want the changes they've made on their ` master ` branch,
120120so we do a 3-way merge of their two branches and our ` master ` .
121121We don't know how well this is going to work,
122122so we make a ` tryidea ` branch first and then do the merge there.
123123
124- ![ ] ( ../artwork/diagrams/remote-story3.eps )
124+ ![ ] ( ../artwork/diagrams/remote-story3.svg )
125125
126126Now we can run our tests
127127and merge everything back into our ` master ` branch if we want.
@@ -145,7 +145,7 @@ creating a new merge commit.
145145(All commits that are simply merges
146146are given a darker color in this example)
147147
148- ![ ] ( ../artwork/diagrams/rebase1.eps )
148+ ![ ] ( ../artwork/diagrams/rebase1.svg )
149149
150150At this point,
151151you both do work and commit changes
@@ -154,7 +154,7 @@ Then she does another commit and you fetch and merge once more.
154154At this point,
155155you'll have a commit history that looks something like this:
156156
157- ![ ] ( ../artwork/diagrams/rebase2.eps )
157+ ![ ] ( ../artwork/diagrams/rebase2.svg )
158158
159159Perfectly fine,
160160but it can get a little confusing
@@ -181,7 +181,7 @@ since nothing points to them,
181181when you run the garbage collection tools
182182(see "The Care and Feeding of Git" section).
183183
184- ![ ] ( ../artwork/diagrams/rebase3.eps )
184+ ![ ] ( ../artwork/diagrams/rebase3.svg )
185185
186186So let's see what happens
187187if we rebase rather than merge in the same scenario.
@@ -198,22 +198,22 @@ You'll notice that now it looks like she cloned you and committed
198198and then you changed that code,
199199rather than you both working at the same time and merging.
200200
201- ![ ] ( ../artwork/diagrams/rebase4.eps )
201+ ![ ] ( ../artwork/diagrams/rebase4.svg )
202202
203203At this point,
204204instead of merging two more times like we did originally,
205205we rebase the next two commits she makes.
206206
207- ![ ] ( ../artwork/diagrams/rebase5.eps )
207+ ![ ] ( ../artwork/diagrams/rebase5.svg )
208208
209- ![ ] ( ../artwork/diagrams/rebase6.eps )
209+ ![ ] ( ../artwork/diagrams/rebase6.svg )
210210
211211And finally,
212212we are left with a commit history that looks like Figure 1,
213213rather than Figure 2,
214214which is what we would have if we had merged instead.
215215
216- ![ ] ( ../artwork/diagrams/rebase7-final.eps )
216+ ![ ] ( ../artwork/diagrams/rebase7-final.svg )
217217
218218> ** NOTE** \
219219 You should remember to only do this on local branches before you push
0 commit comments