8ZV2wYCB

1## A few things conflicted in "git pull --rebase"
2
3$ git pull --rebase
4remote: Generating pack...
5remote: Done counting 476 objects.
6remote: Result has 389 objects.
7remote: Deltifying 389 objects...
8remote:  100% (389/389) done
9remote: Total 389 (delta 276), reused 280 (delta 185)
10Receiving objects: 100% (389/389), 156.52 KiB | 111 KiB/s, done.
11Resolving deltas: 100% (276/276), completed with 41 local objects.
12From git@github.com:drnic/ruby-on-rails-tmbundle
13 + 6686752...2acf109 master     -> origin/master  (forced update)
14 + f2d16a5...9682725 two_point_ooh -> origin/two_point_ooh  (forced update)
15First, rewinding head to replay your work on top of it...
16HEAD is now at 2acf109... go_to_alternate_file model will create an ActiveRecord stub instead of a blank file
17Applying == 1.90.0 2008-03-08
18error: .gitignore: already exists in index
19error: patch failed: ABOUT:1
20error: ABOUT: patch does not apply
21error: patch failed: CHANGELOG:1
22error: CHANGELOG: patch does not apply
23error: Capfile: already exists in index
24error: Commands/Autocomplete Foreign Key Fixture Reference (habtm).tmCommand: already exists in index
25error: Commands/Autocomplete Foreign Key Fixture Reference.tmCommand: already exists in index
26error: patch failed: Commands/Go To Alternate File.plist:16
27error: Commands/Go To Alternate File.plist: patch does not apply
28error: patch failed: Commands/Go To File on This Line.plist:16
29error: Commands/Go To File on This Line.plist: patch does not apply
30error: patch failed: Commands/Go To File.plist:16
31error: Commands/Go To File.plist: patch does not apply
32error: patch failed: Commands/Go To Functional Test.plist:16
33error: Commands/Go To Functional Test.plist: patch does not apply
34error: patch failed: Commands/Go To Helper.plist:16
35error: Commands/Go To Helper.plist: patch does not apply
36error: patch failed: Commands/Go To Javascript.plist:16
37error: Commands/Go To Javascript.plist: patch does not apply
38error: Commands/Go To Model.tmCommand: already exists in index
39error: patch failed: Commands/Go To Stylesheet.plist:16
40error: Commands/Go To Stylesheet.plist: patch does not apply
41error: patch failed: Commands/Go To Unit Test.plist:16
42error: Commands/Go To Unit Test.plist: patch does not apply
43error: patch failed: Commands/Go To View.plist:1
44error: Commands/Go To View.plist: patch does not apply
45error: Commands/Go to Fixture.tmCommand: already exists in index
46error: patch failed: Commands/Make Selection in to Partial.plist:19
47error: Commands/Make Selection in to Partial.plist: patch does not apply
48error: Commands/Redo Last Migration.tmCommand: already exists in index
49error: patch failed: Commands/Show DB Schema.tmCommand:1
50error: Commands/Show DB Schema.tmCommand: patch does not apply
51error: Commands/Test All.tmCommand: already exists in index
52error: Commands/Test Functionals.tmCommand: already exists in index
53error: Commands/Test Integration.tmCommand: already exists in index
54error: Commands/Test Plugins.tmCommand: already exists in index
55error: Commands/Test Recent.tmCommand: already exists in index
56error: Commands/Test Uncommitted.tmCommand: already exists in index
57error: Commands/Test Units.tmCommand: already exists in index
58error: Commands/View demo help.tmCommand: already exists in index
59error: Macros/Add %3A Remove Column.tmMacro: already exists in index
60error: Macros/Add %3A Remove Index.tmMacro: already exists in index
61error: Macros/Add %3A Remove Named Index.tmMacro: already exists in index
62error: Macros/Add %3A Remove Several Columns (marcc).tmMacro: already exists in index
63error: Macros/Add %3A Remove Several Columns.tmMacro: already exists in index
64error: Macros/Add %3A Remove Unique Index.tmMacro: already exists in index
65error: Macros/Create %3A Drop Table.tmMacro: already exists in index
66error: Macros/Drop %3A Create Table.tmMacro: already exists in index
67error: Macros/Remove %3A Add Column.tmMacro: already exists in index
68error: Macros/Rename %3A Rename Several Columns (mncc).tmMacro: already exists in index
69error: Macros/Rename %3A Rename Several Columns.tmMacro: already exists in index
70error: patch failed: Macros/Rename Column.tmMacro:33
71error: Macros/Rename Column.tmMacro: patch does not apply
72error: patch failed: Macros/Rename Table.tmMacro:33
73error: Macros/Rename Table.tmMacro: patch does not apply
74error: Preferences/Template (ERB).tmPreferences: already exists in index
75error: Preferences/Template (Haml).tmPreferences: already exists in index
76error: README: already exists in index
77error: Rakefile: already exists in index
78error: Snippets/$LABEL.tmSnippet: already exists in index
79error: Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet: already exists in index
80error: patch failed: Snippets/180 rails form_tag.plist:3
81error: Snippets/180 rails form_tag.plist: patch does not apply
82error: Snippets/Create binary column.tmSnippet: already exists in index
83error: Snippets/Create boolean column.tmSnippet: already exists in index
84error: Snippets/Create controller class.tmSnippet: already exists in index
85error: Snippets/Create date column.tmSnippet: already exists in index
86error: Snippets/Create datetime column.tmSnippet: already exists in index
87error: Snippets/Create decimal column.tmSnippet: already exists in index
88error: Snippets/Create float column.tmSnippet: already exists in index
89error: Snippets/Create functional test class.tmSnippet: already exists in index
90error: Snippets/Create integer column.tmSnippet: already exists in index
91error: Snippets/Create lock_version column.tmSnippet: already exists in index
92error: Snippets/Create references column.tmSnippet: already exists in index
93error: Snippets/Create string column.tmSnippet: already exists in index
94error: Snippets/Create text column.tmSnippet: already exists in index
95error: Snippets/Create time column.tmSnippet: already exists in index
96error: Snippets/Create timestamp column.tmSnippet: already exists in index
97error: Snippets/Create timestamps columns.tmSnippet: already exists in index
98error: patch failed: Snippets/Migration Create Column (mcc).plist:3
99error: Snippets/Migration Create Column (mcc).plist: patch does not apply
100error: patch failed: Snippets/Migration Create Column Continue (mccc).plist:3
101error: Snippets/Migration Create Column Continue (mccc).plist: patch does not apply
102error: patch failed: Snippets/Migration Drop Create Table (mdct).plist:7
103error: Snippets/Migration Drop Create Table (mdct).plist: patch does not apply
104error: patch failed: Snippets/Migration Remove and Add Column (mrac).plist:7
105error: Snippets/Migration Remove and Add Column (mrac).plist: patch does not apply
106error: Snippets/after_create.tmSnippet: already exists in index
107error: Snippets/after_destroy.tmSnippet: already exists in index
108error: Snippets/after_save.tmSnippet: already exists in index
109error: Snippets/after_update.tmSnippet: already exists in index
110error: Snippets/after_validation.tmSnippet: already exists in index
111error: Snippets/after_validation_on_create.tmSnippet: already exists in index
112error: Snippets/after_validation_on_update.tmSnippet: already exists in index
113error: Snippets/assert(var = assigns(%3Avar)).tmSnippet: already exists in index
114error: Snippets/assert_difference.tmSnippet: already exists in index
115error: Snippets/assert_no_difference.tmSnippet: already exists in index
116error: Snippets/assert_redirected_to (nested path plural).tmSnippet: already exists in index
117error: Snippets/assert_redirected_to (nested path).tmSnippet: already exists in index
118error: Snippets/assert_redirected_to (path plural).tmSnippet: already exists in index
119error: Snippets/assert_redirected_to (path).tmSnippet: already exists in index
120error: Snippets/assert_rjs.tmSnippet: already exists in index
121error: Snippets/assert_select.tmSnippet: already exists in index
122error: Snippets/before_create.tmSnippet: already exists in index
123error: Snippets/before_destroy.tmSnippet: already exists in index
124error: Snippets/before_save.tmSnippet: already exists in index
125error: Snippets/before_update.tmSnippet: already exists in index
126error: Snippets/before_validation.tmSnippet: already exists in index
127error: Snippets/before_validation_on_create.tmSnippet: already exists in index
128error: Snippets/before_validation_on_update.tmSnippet: already exists in index
129error: patch failed: Snippets/belongs_to (bt).plist:1
130error: Snippets/belongs_to (bt).plist: patch does not apply
131error: Snippets/cattr_accessor.tmSnippet: already exists in index
132error: Snippets/def create - resource.tmSnippet: already exists in index
133error: Snippets/def get request.tmSnippet: already exists in index
134error: Snippets/def post request.tmSnippet: already exists in index
135error: Snippets/end.tmSnippet: already exists in index
136error: Snippets/find(%3Aall).tmSnippet: already exists in index
137error: Snippets/find(%3Afirst).tmSnippet: already exists in index
138error: Snippets/find(id).tmSnippet: already exists in index
139error: Snippets/for loop erb.tmSnippet: already exists in index
140error: Snippets/for loop in rhtml.tmSnippet: already exists in index
141error: Snippets/form_for check_box.tmSnippet: already exists in index
142error: Snippets/form_for checkbox.tmSnippet: already exists in index
143error: Snippets/form_for file_field 2.tmSnippet: already exists in index
144error: Snippets/form_for file_field.tmSnippet: already exists in index
145error: Snippets/form_for hidden_field 2.tmSnippet: already exists in index
146error: Snippets/form_for hidden_field.tmSnippet: already exists in index
147error: Snippets/form_for label 2.tmSnippet: already exists in index
148error: Snippets/form_for label.tmSnippet: already exists in index
149error: Snippets/form_for password_field 2.tmSnippet: already exists in index
150error: Snippets/form_for password_field.tmSnippet: already exists in index
151error: Snippets/form_for radio_box 2.tmSnippet: already exists in index
152error: Snippets/form_for radio_box.tmSnippet: already exists in index
153error: Snippets/form_for submit 2.tmSnippet: already exists in index
154error: Snippets/form_for submit.tmSnippet: already exists in index
155error: Snippets/form_for text_area 2.tmSnippet: already exists in index
156error: Snippets/form_for text_area.tmSnippet: already exists in index
157error: Snippets/form_for text_field 2.tmSnippet: already exists in index
158error: Snippets/form_for text_field.tmSnippet: already exists in index
159error: Snippets/form_for with errors.tmSnippet: already exists in index
160error: Snippets/form_for.tmSnippet: already exists in index
161error: patch failed: Snippets/has_many (hm).plist:3
162error: Snippets/has_many (hm).plist: patch does not apply
163error: Snippets/has_many (through).tmSnippet: already exists in index
164error: patch failed: Snippets/has_one (ho).plist:1
165error: Snippets/has_one (ho).plist: patch does not apply
166error: Snippets/image_submit_tag.tmSnippet: already exists in index
167error: Snippets/javascript_include_tag.tmSnippet: already exists in index
168error: patch failed: Snippets/lia.plist:3
169error: Snippets/lia.plist: patch does not apply
170error: patch failed: Snippets/liai.plist:3
171error: Snippets/liai.plist: patch does not apply
172error: patch failed: Snippets/lic.plist:3
173error: Snippets/lic.plist: patch does not apply
174error: patch failed: Snippets/lica.plist:3
175error: Snippets/lica.plist: patch does not apply
176error: patch failed: Snippets/licai.plist:3
177error: Snippets/licai.plist: patch does not apply
178error: Snippets/link_to (nested path plural).tmSnippet: already exists in index
179error: Snippets/link_to (nested path).tmSnippet: already exists in index
180error: Snippets/link_to (path plural).tmSnippet: already exists in index
181error: Snippets/link_to (path).tmSnippet: already exists in index
182error: Snippets/link_to model.tmSnippet: already exists in index
183error: patch failed: Snippets/logger_debug.tmSnippet:3
184error: Snippets/logger_debug.tmSnippet: patch does not apply
185error: patch failed: Snippets/logger_error.tmSnippet:3
186error: Snippets/logger_error.tmSnippet: patch does not apply
187error: patch failed: Snippets/logger_fatal.tmSnippet:3
188error: Snippets/logger_fatal.tmSnippet: patch does not apply
189error: patch failed: Snippets/logger_info.tmSnippet:3
190error: Snippets/logger_info.tmSnippet: patch does not apply
191error: patch failed: Snippets/logger_warn.tmSnippet:3
192error: Snippets/logger_warn.tmSnippet: patch does not apply
193error: Snippets/map(&%3Asym_proc).tmSnippet: already exists in index
194error: Snippets/map_catch_all.tmSnippet: already exists in index
195error: Snippets/map_named_route.tmSnippet: already exists in index
196error: Snippets/map_resource.tmSnippet: already exists in index
197error: Snippets/map_resources.tmSnippet: already exists in index
198error: Snippets/map_with_options.tmSnippet: already exists in index
199error: Snippets/mattr_accessor.tmSnippet: already exists in index
200error: Snippets/page_hide (%2Aids).tmSnippet: already exists in index
201error: Snippets/page_insert_html (position, id, partial).tmSnippet: already exists in index
202error: Snippets/page_replace (id, partial).tmSnippet: already exists in index
203error: Snippets/page_replace_html (id, partial).tmSnippet: already exists in index
204error: Snippets/page_show (%2Aids).tmSnippet: already exists in index
205error: Snippets/page_toggle (%2Aids).tmSnippet: already exists in index
206error: Snippets/page_visual_effect (effect, id).tmSnippet: already exists in index
207error: patch failed: Snippets/rcea.plist:1
208error: Snippets/rcea.plist: patch does not apply
209error: patch failed: Snippets/rcec.plist:1
210error: Snippets/rcec.plist: patch does not apply
211error: patch failed: Snippets/rceca.plist:1
212error: Snippets/rceca.plist: patch does not apply
213error: Snippets/redirect_to (nested path plural).tmSnippet: already exists in index
214error: Snippets/redirect_to (nested path).tmSnippet: already exists in index
215error: Snippets/redirect_to (path plural).tmSnippet: already exists in index
216error: Snippets/redirect_to (path).tmSnippet: already exists in index
217error: patch failed: Snippets/render (partial,collection) (rpc).plist:1
218error: Snippets/render (partial,collection) (rpc).plist: patch does not apply
219error: patch failed: Snippets/render (partial,locals) (rpl).plist:1
220error: Snippets/render (partial,locals) (rpl).plist: patch does not apply
221error: patch failed: Snippets/render (partial,object) (rpo).plist:1
222error: Snippets/render (partial,object) (rpo).plist: patch does not apply
223error: Snippets/render (text,layout=%3Etrue) (rtlt).plist: already exists in index
224error: Snippets/render (update).tmSnippet: already exists in index
225error: Snippets/respond_to (html).tmSnippet: already exists in index
226error: Snippets/respond_to.tmSnippet: already exists in index
227error: Snippets/returning do %7Cvariable%7C %E2%80%A6 end.tmSnippet: already exists in index
228error: Snippets/stylesheet_link_tag.tmSnippet: already exists in index
229error: Snippets/submit_tag.tmSnippet: already exists in index
230error: Snippets/t_binary (tcbi).tmSnippet: already exists in index
231error: Snippets/t_boolean (tcb).tmSnippet: already exists in index
232error: Snippets/t_date (tcda).tmSnippet: already exists in index
233error: Snippets/t_datetime (tcdt).tmSnippet: already exists in index
234error: Snippets/t_decimal (tcd).tmSnippet: already exists in index
235error: Snippets/t_float (tcf).tmSnippet: already exists in index
236error: Snippets/t_integer (tci).tmSnippet: already exists in index
237error: Snippets/t_lock_version (tcl).tmSnippet: already exists in index
238error: Snippets/t_references (tcr).tmSnippet: already exists in index
239error: Snippets/t_string (tcs).tmSnippet: already exists in index
240error: Snippets/t_text (tct).tmSnippet: already exists in index
241error: Snippets/t_time (tcti).tmSnippet: already exists in index
242error: Snippets/t_timestamp (tcts).tmSnippet: already exists in index
243error: Snippets/t_timestamps (tctss).tmSnippet: already exists in index
244error: patch failed: Snippets/validates_exclusion_of (ve).plist:3
245error: Snippets/validates_exclusion_of (ve).plist: patch does not apply
246error: patch failed: Snippets/validates_exclusion_of if (veif).plist:3
247error: Snippets/validates_exclusion_of if (veif).plist: patch does not apply
248error: Snippets/validates_format_of if.tmSnippet: already exists in index
249error: Snippets/validates_format_of.tmSnippet: already exists in index
250error: Snippets/validates_inclusion_of if.tmSnippet: already exists in index
251error: Snippets/validates_inclusion_of.tmSnippet: already exists in index
252error: Snippets/validates_length_of if.tmSnippet: already exists in index
253error: Snippets/validates_numericality_of if.tmSnippet: already exists in index
254error: Snippets/validates_numericality_of.tmSnippet: already exists in index
255error: patch failed: Snippets/validates_presence_of (vp).plist:1
256error: Snippets/validates_presence_of (vp).plist: patch does not apply
257error: Snippets/wants_format.tmSnippet: already exists in index
258error: Snippets/xhr delete.tmSnippet: already exists in index
259error: Snippets/xhr get.tmSnippet: already exists in index
260error: Snippets/xhr post.tmSnippet: already exists in index
261error: Snippets/xhr put.tmSnippet: already exists in index
262error: patch failed: Support/bin/create_partial_from_selection.rb:28
263error: Support/bin/create_partial_from_selection.rb: patch does not apply
264error: Support/bin/fixture_auto_complete.rb: already exists in index
265error: patch failed: Support/bin/generate.rb:9
266error: Support/bin/generate.rb: patch does not apply
267error: patch failed: Support/bin/generate_quick_migration.rb:42
268error: Support/bin/generate_quick_migration.rb: patch does not apply
269error: patch failed: Support/bin/go_to_alternate_file.rb:7
270error: Support/bin/go_to_alternate_file.rb: patch does not apply
271error: patch failed: Support/bin/go_to_file_on_current_line.rb:7
272error: Support/bin/go_to_file_on_current_line.rb: patch does not apply
273error: patch failed: Support/bin/insert_add_column_or_create_table.rb:22
274error: Support/bin/insert_add_column_or_create_table.rb: patch does not apply
275error: patch failed: Support/bin/intelligent_migration_snippet.rb:1
276error: Support/bin/intelligent_migration_snippet.rb: patch does not apply
277error: patch failed: Support/bin/rake_helper.rb:33
278error: Support/bin/rake_helper.rb: patch does not apply
279error: Support/bin/show_schema.rb: already exists in index
280error: patch failed: Support/lib/rails/buffer.rb:24
281error: Support/lib/rails/buffer.rb: patch does not apply
282error: Support/lib/rails/command_go_to_file.rb: already exists in index
283error: Support/lib/rails/generate.rb: already exists in index
284error: Support/lib/rails/inflections.rb: already exists in index
285error: Support/lib/rails/inflector.rb: already exists in index
286error: patch failed: Support/lib/rails/misc.rb:3
287error: Support/lib/rails/misc.rb: patch does not apply
288error: patch failed: Support/lib/rails/rails_path.rb:8
289error: Support/lib/rails/rails_path.rb: patch does not apply
290error: patch failed: Support/lib/rails/text_mate.rb:41
291error: Support/lib/rails/text_mate.rb: patch does not apply
292error: patch failed: Support/lib/rails_bundle_tools.rb:11
293error: Support/lib/rails_bundle_tools.rb: patch does not apply
294error: patch failed: Support/plugins/footnotes-edge/init.rb:15
295error: Support/plugins/footnotes-edge/init.rb: patch does not apply
296error: patch failed: Support/plugins/footnotes-edge/lib/textmate_backtracer.rb:1
297error: Support/plugins/footnotes-edge/lib/textmate_backtracer.rb: patch does not apply
298error: patch failed: Support/plugins/footnotes-edge/lib/textmate_footnotes.rb:15
299error: Support/plugins/footnotes-edge/lib/textmate_footnotes.rb: patch does not apply
300error: Support/plugins/footnotes-edge/templates/rescues/template_error.erb: already exists in index
301error: patch failed: Support/plugins/footnotes-edge/test/mock_controller.rb:5
302error: Support/plugins/footnotes-edge/test/mock_controller.rb: patch does not apply
303error: patch failed: Support/plugins/footnotes-edge/test/textmate_footnotes_test.rb:11
304error: Support/plugins/footnotes-edge/test/textmate_footnotes_test.rb: patch does not apply
305error: patch failed: Support/plugins/footnotes/init.rb:15
306error: Support/plugins/footnotes/init.rb: patch does not apply
307error: patch failed: Support/plugins/footnotes/lib/textmate_backtracer.rb:1
308error: Support/plugins/footnotes/lib/textmate_backtracer.rb: patch does not apply
309error: patch failed: Support/plugins/footnotes/lib/textmate_footnotes.rb:15
310error: Support/plugins/footnotes/lib/textmate_footnotes.rb: patch does not apply
311error: patch failed: Support/plugins/footnotes/test/mock_controller.rb:5
312error: Support/plugins/footnotes/test/mock_controller.rb: patch does not apply
313error: patch failed: Support/plugins/footnotes/test/textmate_footnotes_test.rb:11
314error: Support/plugins/footnotes/test/textmate_footnotes_test.rb: patch does not apply
315error: Support/test/app_fixtures/app/controllers/admin/base_controller.rb: already exists in index
316error: Support/test/app_fixtures/app/controllers/posts_controller.rb: already exists in index
317error: Support/test/app_fixtures/app/controllers/user_controller.rb: already exists in index
318error: Support/test/app_fixtures/app/controllers/users_controller.rb: already exists in index
319error: Support/test/app_fixtures/app/helpers/user_helper.rb: already exists in index
320error: Support/test/app_fixtures/app/models/notifier.rb: already exists in index
321error: Support/test/app_fixtures/app/models/person.rb: already exists in index
322error: Support/test/app_fixtures/app/models/user.rb: already exists in index
323error: Support/test/app_fixtures/app/views/notifier/forgot_password.html.erb: already exists in index
324error: Support/test/app_fixtures/app/views/users/existing_views.html.erb: already exists in index
325error: Support/test/app_fixtures/app/views/users/existing_views.js.rjs: already exists in index
326error: Support/test/app_fixtures/app/views/users/existing_views.wacky.erb: already exists in index
327error: Support/test/app_fixtures/app/views/users/existing_views.xml.builder: already exists in index
328error: Support/test/app_fixtures/config/boot.rb: already exists in index
329error: Support/test/app_fixtures/config/environment.rb: already exists in index
330error: Support/test/app_fixtures/script/generate: already exists in index
331error: patch failed: Support/test/buffer_test.rb:1
332error: Support/test/buffer_test.rb: patch does not apply
333error: Support/test/fixtures/app/controllers/posts_controller.rb: already exists in index
334error: Support/test/generator_test.rb: already exists in index
335error: patch failed: Support/test/rails_path_test.rb:1
336error: Support/test/rails_path_test.rb: patch does not apply
337error: patch failed: Support/test/test_helper.rb:1
338error: Support/test/test_helper.rb: patch does not apply
339error: patch failed: Support/test/text_mate_mock.rb:1
340error: Support/test/text_mate_mock.rb: patch does not apply
341error: patch failed: Support/test/text_mate_test.rb:0
342error: Support/test/text_mate_test.rb: patch does not apply
343error: Syntaxes/JavaScript (Rails).tmLanguage: already exists in index
344error: Syntaxes/RJS.tmLanguage: already exists in index
345error: patch failed: Syntaxes/Ruby on Rails.plist:4
346error: Syntaxes/Ruby on Rails.plist: patch does not apply
347error: patch failed: Syntaxes/SQL (Rails).plist:1
348error: Syntaxes/SQL (Rails).plist: patch does not apply
349error: patch failed: TODO:1
350error: TODO: patch does not apply
351error: config/deploy.rb: already exists in index
352error: config/slicehost.yml.sample: already exists in index
353error: config/website.yml.sample: already exists in index
354error: patch failed: info.plist:15
355error: info.plist: patch does not apply
356error: script/clean_bundle_file_names: already exists in index
357error: script/destroy: already exists in index
358error: script/generate: already exists in index
359error: script/txt2html: already exists in index
360error: tasks/dist.rake: already exists in index
361error: tasks/website.rake: already exists in index
362error: website/demo.html: already exists in index
363error: website/demo.txt: already exists in index
364error: website/index.html: already exists in index
365error: website/index.txt: already exists in index
366error: website/javascripts/rounded_corners_lite.inc.js: already exists in index
367error: website/peepcode.html: already exists in index
368error: website/peepcode.txt: already exists in index
369error: website/stylesheets/screen.css: already exists in index
370error: website/template.html.erb: already exists in index
371Using index info to reconstruct a base tree...
372Falling back to patching base and 3-way merge...
373Auto-merged CHANGELOG
374CONFLICT (content): Merge conflict in CHANGELOG
375Auto-merged Preferences/Template (ERB).tmPreferences
376CONFLICT (add/add): Merge conflict in Preferences/Template (ERB).tmPreferences
377Auto-merged Preferences/Template (Haml).tmPreferences
378CONFLICT (add/add): Merge conflict in Preferences/Template (Haml).tmPreferences
379Auto-merged Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet
380CONFLICT (add/add): Merge conflict in Snippets/%3C%= Fixtures_identify(%3Asymbol) %%3E.tmSnippet
381Auto-merged Snippets/180 rails form_tag.plist
382CONFLICT (content): Merge conflict in Snippets/180 rails form_tag.plist
383Auto-merged Snippets/form_for check_box.tmSnippet
384CONFLICT (add/add): Merge conflict in Snippets/form_for check_box.tmSnippet
385Auto-merged Snippets/form_for checkbox.tmSnippet
386CONFLICT (add/add): Merge conflict in Snippets/form_for checkbox.tmSnippet
387Auto-merged Snippets/form_for file_field 2.tmSnippet
388CONFLICT (add/add): Merge conflict in Snippets/form_for file_field 2.tmSnippet
389Auto-merged Snippets/form_for file_field.tmSnippet
390CONFLICT (add/add): Merge conflict in Snippets/form_for file_field.tmSnippet
391Auto-merged Snippets/form_for hidden_field 2.tmSnippet
392CONFLICT (add/add): Merge conflict in Snippets/form_for hidden_field 2.tmSnippet
393Auto-merged Snippets/form_for hidden_field.tmSnippet
394CONFLICT (add/add): Merge conflict in Snippets/form_for hidden_field.tmSnippet
395Auto-merged Snippets/form_for label 2.tmSnippet
396CONFLICT (add/add): Merge conflict in Snippets/form_for label 2.tmSnippet
397Auto-merged Snippets/form_for label.tmSnippet
398CONFLICT (add/add): Merge conflict in Snippets/form_for label.tmSnippet
399Auto-merged Snippets/form_for password_field 2.tmSnippet
400CONFLICT (add/add): Merge conflict in Snippets/form_for password_field 2.tmSnippet
401Auto-merged Snippets/form_for password_field.tmSnippet
402CONFLICT (add/add): Merge conflict in Snippets/form_for password_field.tmSnippet
403Auto-merged Snippets/form_for radio_box 2.tmSnippet
404CONFLICT (add/add): Merge conflict in Snippets/form_for radio_box 2.tmSnippet
405Auto-merged Snippets/form_for radio_box.tmSnippet
406CONFLICT (add/add): Merge conflict in Snippets/form_for radio_box.tmSnippet
407Auto-merged Snippets/form_for submit 2.tmSnippet
408CONFLICT (add/add): Merge conflict in Snippets/form_for submit 2.tmSnippet
409Auto-merged Snippets/form_for submit.tmSnippet
410CONFLICT (add/add): Merge conflict in Snippets/form_for submit.tmSnippet
411Auto-merged Snippets/form_for text_area 2.tmSnippet
412CONFLICT (add/add): Merge conflict in Snippets/form_for text_area 2.tmSnippet
413Auto-merged Snippets/form_for text_area.tmSnippet
414CONFLICT (add/add): Merge conflict in Snippets/form_for text_area.tmSnippet
415Auto-merged Snippets/form_for text_field 2.tmSnippet
416CONFLICT (add/add): Merge conflict in Snippets/form_for text_field 2.tmSnippet
417Auto-merged Snippets/form_for text_field.tmSnippet
418CONFLICT (add/add): Merge conflict in Snippets/form_for text_field.tmSnippet
419Auto-merged Snippets/form_for with errors.tmSnippet
420CONFLICT (add/add): Merge conflict in Snippets/form_for with errors.tmSnippet
421Auto-merged Snippets/form_for.tmSnippet
422CONFLICT (add/add): Merge conflict in Snippets/form_for.tmSnippet
423Auto-merged Snippets/image_submit_tag.tmSnippet
424CONFLICT (add/add): Merge conflict in Snippets/image_submit_tag.tmSnippet
425Auto-merged Snippets/javascript_include_tag.tmSnippet
426CONFLICT (add/add): Merge conflict in Snippets/javascript_include_tag.tmSnippet
427Auto-merged Snippets/lia.plist
428CONFLICT (content): Merge conflict in Snippets/lia.plist
429Auto-merged Snippets/liai.plist
430CONFLICT (content): Merge conflict in Snippets/liai.plist
431Auto-merged Snippets/lic.plist
432CONFLICT (content): Merge conflict in Snippets/lic.plist
433Auto-merged Snippets/lica.plist
434CONFLICT (content): Merge conflict in Snippets/lica.plist
435Auto-merged Snippets/licai.plist
436CONFLICT (content): Merge conflict in Snippets/licai.plist
437Auto-merged Snippets/link_to (nested path plural).tmSnippet
438CONFLICT (add/add): Merge conflict in Snippets/link_to (nested path plural).tmSnippet
439Auto-merged Snippets/link_to (nested path).tmSnippet
440CONFLICT (add/add): Merge conflict in Snippets/link_to (nested path).tmSnippet
441Auto-merged Snippets/link_to (path plural).tmSnippet
442CONFLICT (add/add): Merge conflict in Snippets/link_to (path plural).tmSnippet
443Auto-merged Snippets/link_to (path).tmSnippet
444CONFLICT (add/add): Merge conflict in Snippets/link_to (path).tmSnippet
445Auto-merged Snippets/link_to model.tmSnippet
446CONFLICT (add/add): Merge conflict in Snippets/link_to model.tmSnippet
447Auto-merged Snippets/stylesheet_link_tag.tmSnippet
448CONFLICT (add/add): Merge conflict in Snippets/stylesheet_link_tag.tmSnippet
449Auto-merged Snippets/submit_tag.tmSnippet
450CONFLICT (add/add): Merge conflict in Snippets/submit_tag.tmSnippet
451Auto-merged Support/bin/create_partial_from_selection.rb
452CONFLICT (content): Merge conflict in Support/bin/create_partial_from_selection.rb
453Auto-merged Support/bin/generate.rb
454CONFLICT (content): Merge conflict in Support/bin/generate.rb
455Auto-merged Support/bin/generate_quick_migration.rb
456CONFLICT (content): Merge conflict in Support/bin/generate_quick_migration.rb
457Auto-merged Support/bin/rake_helper.rb
458Auto-merged Support/lib/rails/command_go_to_file.rb
459CONFLICT (add/add): Merge conflict in Support/lib/rails/command_go_to_file.rb
460Auto-merged Support/lib/rails/text_mate.rb
461CONFLICT (content): Merge conflict in Support/lib/rails/text_mate.rb
462Auto-merged Support/lib/rails_bundle_tools.rb
463CONFLICT (content): Merge conflict in Support/lib/rails_bundle_tools.rb
464Auto-merged Support/test/app_fixtures/script/generate
465Auto-merged Support/test/text_mate_mock.rb
466CONFLICT (content): Merge conflict in Support/test/text_mate_mock.rb
467Auto-merged script/clean_bundle_file_names
468Auto-merged script/destroy
469Auto-merged script/generate
470Auto-merged script/txt2html
471Failed to merge in the changes.
472Patch failed at 0001.
473
474When you have resolved this problem run "git rebase --continue".
475If you would prefer to skip this patch, instead run "git rebase --skip".
476To restore the original branch and stop rebasing run "git rebase --abort".