Last active
December 26, 2015 03:29
-
-
Save rasa/7086767 to your computer and use it in GitHub Desktop.
git rebase failure
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| ross@pv1:~/repos$ git clone git@github.com:rasa/packer.git | |
| Cloning into 'packer'... | |
| Warning: Permanently added 'github.com' (RSA) to the list of known hosts. | |
| remote: Counting objects: 12193, done. | |
| remote: Compressing objects: 100% (6880/6880), done. | |
| remote: Total 12193 (delta 5643), reused 11468 (delta 5003) | |
| Receiving objects: 100% (12193/12193), 5.69 MiB | 351 KiB/s, done. | |
| Resolving deltas: 100% (5643/5643), done. | |
| ross@pv1:~/repos$ cd packer | |
| ross@pv1:~/repos/packer$ git remote add upstream https://github.com/mitchellh/packer.git | |
| ross@pv1:~/repos/packer$ git fetch upstream | |
| remote: Counting objects: 237, done. | |
| remote: Compressing objects: 100% (123/123), done. | |
| remote: Total 162 (delta 109), reused 85 (delta 33) | |
| Receiving objects: 100% (162/162), 28.55 KiB, done. | |
| Resolving deltas: 100% (109/109), completed with 40 local objects. | |
| From https://github.com/mitchellh/packer | |
| * [new branch] docker -> upstream/docker | |
| * [new branch] fix#536 -> upstream/fix#536 | |
| * [new branch] master -> upstream/master | |
| * [new tag] v0.3.3 -> v0.3.3 | |
| * [new tag] v0.3.4 -> v0.3.4 | |
| * [new tag] v0.3.5 -> v0.3.5 | |
| * [new tag] v0.3.6 -> v0.3.6 | |
| * [new tag] v0.3.8 -> v0.3.8 | |
| * [new tag] v0.3.9 -> v0.3.9 | |
| From https://github.com/mitchellh/packer | |
| * [new tag] v0.3.10 -> v0.3.10 | |
| ross@pv1:~/repos/packer$ git merge upstream/master | |
| Updating 9357c25..50f65ad | |
| Fast-forward | |
| CHANGELOG.md | 17 ++++++++++++- | |
| builder/virtualbox/builder.go | 1 + | |
| builder/virtualbox/driver.go | 30 ++++++++++++++++++++++- | |
| builder/virtualbox/step_create_disk.go | 8 +----- | |
| builder/vmware/builder.go | 1 + | |
| config.go | 1 + | |
| packer/version.go | 2 +- | |
| plugin/provisioner-ansible-local/main.go | 10 ++++++++ | |
| plugin/provisioner-ansible-local/main_test.go | 1 + | |
| post-processor/vagrant/aws.go | 14 ++++++++++- | |
| post-processor/vagrant/util.go | 7 ++++-- | |
| post-processor/vagrant/virtualbox.go | 16 ++++++++++-- | |
| post-processor/vagrant/vmware.go | 14 ++++++++++- | |
| provisioner/ansible-local/provisioner.go | 225 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| provisioner/ansible-local/provisioner_test.go | 71 +++++++++++++++++++++++++++++++++++++++++++++++++++++ | |
| provisioner/salt-masterless/provisioner.go | 60 +++++---------------------------------------- | |
| scripts/build.sh | 4 +++ | |
| website/Gemfile | 2 -- | |
| website/Gemfile.lock | 30 +++++++++++------------ | |
| website/source/docs/post-processors/vagrant.html.markdown | 15 ++++++++++++ | |
| website/source/docs/provisioners/ansible-local.html.markdown | 50 +++++++++++++++++++++++++++++++++++++ | |
| website/source/layouts/docs.erb | 1 + | |
| 22 files changed, 493 insertions(+), 87 deletions(-) | |
| create mode 100644 plugin/provisioner-ansible-local/main.go | |
| create mode 100644 plugin/provisioner-ansible-local/main_test.go | |
| create mode 100644 provisioner/ansible-local/provisioner.go | |
| create mode 100644 provisioner/ansible-local/provisioner_test.go | |
| create mode 100644 website/source/docs/provisioners/ansible-local.html.markdown | |
| ross@pv1:~/repos/packer$ git push | |
| Warning: Permanently added 'github.com' (RSA) to the list of known hosts. | |
| Counting objects: 203, done. | |
| Delta compression using up to 8 threads. | |
| Compressing objects: 100% (48/48), done. | |
| Writing objects: 100% (142/142), 24.02 KiB, done. | |
| Total 142 (delta 95), reused 134 (delta 88) | |
| To git@github.com:rasa/packer.git | |
| 9357c25..50f65ad master -> master | |
| ross@pv1:~/repos/packer$ git checkout add-vagrant-support-for-digitalocean | |
| Branch add-vagrant-support-for-digitalocean set up to track remote branch add-vagrant-support-for-digitalocean from origin by rebasing. | |
| Switched to a new branch 'add-vagrant-support-for-digitalocean' | |
| ross@pv1:~/repos/packer$ git pull | |
| Warning: Permanently added 'github.com' (RSA) to the list of known hosts. | |
| Current branch add-vagrant-support-for-digitalocean is up to date. | |
| ross@pv1:~/repos/packer$ git rebase master | |
| First, rewinding head to replay your work on top of it... | |
| Applying: Adds vagrant support for digitalocean | |
| Using index info to reconstruct a base tree... | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging post-processor/vagrant/post-processor.go | |
| CONFLICT (content): Merge conflict in post-processor/vagrant/post-processor.go | |
| Auto-merging builder/digitalocean/builder.go | |
| Failed to merge in the changes. | |
| Patch failed at 0001 Adds vagrant support for digitalocean | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| ross@pv1:~/repos/packer$ git status | |
| # Not currently on any branch. | |
| # Changes to be committed: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # | |
| # modified: builder/digitalocean/api.go | |
| # modified: builder/digitalocean/artifact.go | |
| # modified: builder/digitalocean/builder.go | |
| # modified: builder/digitalocean/step_snapshot.go | |
| # modified: builder/digitalocean/wait.go | |
| # new file: post-processor/vagrant/digitalocean.go | |
| # new file: post-processor/vagrant/digitalocean_test.go | |
| # | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: post-processor/vagrant/post-processor.go | |
| # | |
| ross@pv1:~/repos/packer$ git add post-processor/vagrant/post-processor.go | |
| ross@pv1:~/repos/packer$ git rebase --continue | |
| Applying: Adds vagrant support for digitalocean | |
| Applying: check for both 'message' and 'error_message' in error response | |
| Applying: fixed artifact test | |
| ross@pv1:~/repos/packer$ git status | |
| # On branch add-vagrant-support-for-digitalocean | |
| # Your branch and 'origin/add-vagrant-support-for-digitalocean' have diverged, | |
| # and have 67 and 4 different commits each, respectively. | |
| # | |
| nothing to commit (working directory clean) | |
| ross@pv1:~/repos/packer$ git push | |
| Warning: Permanently added 'github.com' (RSA) to the list of known hosts. | |
| To git@github.com:rasa/packer.git | |
| ! [rejected] add-vagrant-support-for-digitalocean -> add-vagrant-support-for-digitalocean (non-fast-forward) | |
| error: failed to push some refs to 'git@github.com:rasa/packer.git' | |
| hint: Updates were rejected because the tip of your current branch is behind | |
| hint: its remote counterpart. Merge the remote changes (e.g. 'git pull') | |
| hint: before pushing again. | |
| hint: See the 'Note about fast-forwards' in 'git push --help' for details. | |
| ross@pv1:~/repos/packer$ git pull | |
| Warning: Permanently added 'github.com' (RSA) to the list of known hosts. | |
| First, rewinding head to replay your work on top of it... | |
| Applying: Add ansible-local provisioner | |
| Applying: Add ansible-local provisioner website docs | |
| Applying: Add tests for ansible-local provisioner | |
| Applying: Define the default staging dir using a const var | |
| Applying: Add tests for ansible provisioner default settings | |
| Applying: Enable ansible-local provisioner | |
| Applying: Use the same vagrant post-processor for amazon instances than EBS. Fixes #502 | |
| Using index info to reconstruct a base tree... | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging post-processor/vagrant/post-processor.go | |
| CONFLICT (content): Merge conflict in post-processor/vagrant/post-processor.go | |
| Failed to merge in the changes. | |
| Patch failed at 0007 Use the same vagrant post-processor for amazon instances than EBS. Fixes #502 | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| ross@pv1:~/repos/packer$ git status | |
| # Not currently on any branch. | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: post-processor/vagrant/post-processor.go | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| ross@pv1:~/repos/packer$ git add post-processor/vagrant/post-processor.go | |
| ross@pv1:~/repos/packer$ git rebase --continue | |
| Applying: Use the same vagrant post-processor for amazon instances than EBS. Fixes #502 | |
| Applying: Add compression_level option to vagrant post-processors | |
| Applying: Update docs for Virtualbox and VMware as well | |
| Applying: Moved the 1 sec timeout to the export step | |
| Applying: Formatted contributions | |
| Applying: provisioner/salt-masterless: move states to /srv/salt, not /srv/salt/states | |
| Applying: provisioner/salt-masterless: use communicator.UploadDir | |
| Applying: builder/digitalocean: Scrub config before logging [GH-516] | |
| Applying: Update CHANGELOG | |
| Applying: Fix race condition after launching EC2 instance | |
| Applying: common/config: config filter function [GH-521] | |
| Applying: common/config: strip keys appropriate for OpenStack. | |
| Applying: communicator/ssh: explicitly set c.conn = nil | |
| Applying: Update CHANGELOG | |
| Applying: Update CHANGELOG | |
| Applying: Update CHANGELOG | |
| Applying: Update CHANGELOG | |
| Applying: I found that I needed the shutdown command to be run as root. | |
| Applying: provisioner/shell: fix EOF detection | |
| Applying: provisoiner/shell: append only needs to add a byte for UnixReader | |
| Applying: provisioner/shell: comment on why we return right away if advance == 0 | |
| Applying: Update CHANGELOG | |
| Applying: Remove dependency on identifier package, use time ordered UUID [GH-541] | |
| Applying: command/build: remove asserts framewor | |
| Applying: builder/amazon,builder/openstack: remove more cgl libs | |
| Applying: packer/rpc: don't depend on cgl | |
| Applying: packer: no more asserts lib | |
| Applying: common/uuid: add test, albeit weak | |
| Applying: fix typo in docs for saltmasterless provisioner. bootstrap was spelled incorrectly | |
| Applying: builder/amazon/chroot: | |
| Applying: contributing: clarify how to submit debug output with a new issue | |
| Applying: Update CHANGELOG | |
| Applying: post-processor/vagrant: fix bug in ova support caused by wrong file path | |
| Applying: builder/virtualbox: use proper SATA port arg [GH-547] | |
| Applying: builder/virtualbox,vmware: support user templates in SSH key path | |
| Applying: Build script now installs binaries to $GOPATH/bin | |
| Applying: Update CHANGELOG | |
| Applying: Update CHANGELOG | |
| Applying: Update CHANGELOG and link in Ansible | |
| Applying: v0.3.10 | |
| Applying: Up version for dev | |
| Applying: website: update Gemfile | |
| Applying: Adds vagrant support for digitalocean | |
| Using index info to reconstruct a base tree... | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging builder/digitalocean/api.go | |
| CONFLICT (content): Merge conflict in builder/digitalocean/api.go | |
| Failed to merge in the changes. | |
| Patch failed at 0049 Adds vagrant support for digitalocean | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| ross@pv1:~/repos/packer$ git status | |
| # Not currently on any branch. | |
| # Unmerged paths: | |
| # (use "git reset HEAD <file>..." to unstage) | |
| # (use "git add/rm <file>..." as appropriate to mark resolution) | |
| # | |
| # both modified: builder/digitalocean/api.go | |
| # | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| ross@pv1:~/repos/packer$ git add builder/digitalocean/api.go | |
| ross@pv1:~/repos/packer$ git status | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| ross@pv1:~/repos/packer$ git rebase --continue | |
| Applying: Adds vagrant support for digitalocean | |
| No changes - did you forget to use 'git add'? | |
| If there is nothing left to stage, chances are that something else | |
| already introduced the same changes; you might want to skip this patch. | |
| When you have resolved this problem run "git rebase --continue". | |
| If you would prefer to skip this patch, instead run "git rebase --skip". | |
| To check out the original branch and stop rebasing run "git rebase --abort". | |
| ross@pv1:~/repos/packer$ git status | |
| # Not currently on any branch. | |
| nothing to commit (working directory clean) | |
| ross@pv1:~/repos/packer$ |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment