alahouzeFirst, rewinding head to replay your work on top of it... Applying: Fix first sign in Using index info to reconstruct a base tree... M app/controllers/application_controller.rb M app/controllers/index_controller.rb M app/controllers/users_controller.rb M config/locales/en.guide.yml Falling back to patching base and 3-way merge... Auto-merging app/controllers/application_controller.rb No changes -- Patch already applied. Applying: Initial beta config Using index info to reconstruct a base tree... M app/assets/images/favicon.ico Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Beta initializers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging config/initializers/beta.rb CONFLICT (add/add): Merge conflict in config/initializers/beta.rb error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Beta initializers Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)5 years ago
First, rewinding head to replay your work on top of it... Applying: Fix first sign in Using index info to reconstruct a base tree... M app/controllers/application_controller.rb M app/controllers/index_controller.rb M app/controllers/users_controller.rb M config/locales/en.guide.yml Falling back to patching base and 3-way merge... Auto-merging app/controllers/application_controller.rb No changes -- Patch already applied. Applying: Initial beta config Using index info to reconstruct a base tree... M app/assets/images/favicon.ico Falling back to patching base and 3-way merge... No changes -- Patch already applied. Applying: Beta initializers Using index info to reconstruct a base tree... Falling back to patching base and 3-way merge... Auto-merging config/initializers/beta.rb CONFLICT (add/add): Merge conflict in config/initializers/beta.rb error: Failed to merge in the changes. hint: Use 'git am --show-current-patch' to see the failed patch Patch failed at 0003 Beta initializers Resolve all conflicts manually, mark them as resolved with "git add/rm <conflicted_files>", then run "git rebase --continue". You can instead skip this commit: run "git rebase --skip". To abort and get back to the state before "git rebase", run "git rebase --abort". (1)5 years ago