Last active
September 8, 2015 17:34
-
-
Save sheeley/537f6562e762b288cef8 to your computer and use it in GitHub Desktop.
git rebase leaves orphan files
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
| ➜ tcs git:(master) git checkout feature/RED-599-Bundling | |
| Branch feature/RED-599-Bundling set up to track remote branch feature/RED-599-Bundling from origin. | |
| Switched to a new branch 'feature/RED-599-Bundling' | |
| ➜ tcs git:(feature/RED-599-Bundling) git rebase feature/fanatics | |
| First, rewinding head to replay your work on top of it... | |
| Applying: PDP Round swatches, exposed sizing. | |
| Applying: More updates to the PDP; circle swatches, flush left, fixed color swatch | |
| Using index info to reconstruct a base tree... | |
| M TCS.Website/Areas/Fullsite/Views/Catalog/ProductDetails.ascx | |
| M TCS.Website/css/fullsite/global.css | |
| M TCS.Website/sass/fullsite/Partials/_fonts.scss | |
| M TCS.Website/sass/fullsite/config/_fullsite-settings.scss | |
| M TCS.Website/sass/fullsite/legacy/_global.scss | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging TCS.Website/sass/fullsite/legacy/_global.scss | |
| Auto-merging TCS.Website/sass/fullsite/config/_fullsite-settings.scss | |
| Auto-merging TCS.Website/sass/fullsite/Partials/_fonts.scss | |
| Auto-merging TCS.Website/css/fullsite/global.css | |
| Auto-merging TCS.Website/Areas/Fullsite/Views/Catalog/ProductDetails.ascx | |
| Applying: RED-441 Ongoing edits to the PDP. Fixed exposed sizing and made alert | |
| Applying: Ongoing changes to PDP. | |
| Using index info to reconstruct a base tree... | |
| M TCS.Website/sass/fullsite/Partials/_forms.scss | |
| M TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| Falling back to patching base and 3-way merge... | |
| Auto-merging TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| CONFLICT (content): Merge conflict in TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| Auto-merging TCS.Website/sass/fullsite/Partials/_forms.scss | |
| Failed to merge in the changes. | |
| Patch failed at 0004 Ongoing changes to PDP. | |
| The copy of the patch that failed is found in: | |
| /Users/jsheeley/git/tcs/.git/rebase-apply/patch | |
| When you have resolved this problem, run "git rebase --continue". | |
| If you prefer to skip this patch, run "git rebase --skip" instead. | |
| To check out the original branch and stop rebasing, run "git rebase --abort". | |
| ➜ tcs git:(237c56f) ✗ git mergetool | |
| Merging: | |
| TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| Normal merge conflict for 'TCS.Website/sass/fullsite/site-sections/_browse.scss': | |
| {local}: modified file | |
| {remote}: modified file | |
| ➜ tcs git:(237c56f) ✗ git rebase --continue | |
| TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png: needs update | |
| TCS.Website/images/sprite-src/fullsite/sizeChart.png: needs update | |
| You must edit all merge conflicts and then | |
| mark them as resolved using git add | |
| ➜ tcs git:(237c56f) ✗ git status | |
| rebase in progress; onto 5cb0f82 | |
| You are currently rebasing branch 'feature/RED-599-Bundling' on '5cb0f82'. | |
| (all conflicts fixed: run "git rebase --continue") | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: TCS.Website/sass/fullsite/Partials/_forms.scss | |
| modified: TCS.Website/sass/fullsite/Partials/_swatches.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_product.scss | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| ➜ tcs git:(237c56f) ✗ git rebase --continue | |
| TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png: needs update | |
| TCS.Website/images/sprite-src/fullsite/sizeChart.png: needs update | |
| You must edit all merge conflicts and then | |
| mark them as resolved using git add | |
| ➜ tcs git:(237c56f) ✗ git add TCS.Website/ | |
| ➜ tcs git:(237c56f) ✗ git rebase --continue | |
| TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png: needs update | |
| TCS.Website/images/sprite-src/fullsite/sizeChart.png: needs update | |
| You must edit all merge conflicts and then | |
| mark them as resolved using git add | |
| ➜ tcs git:(237c56f) ✗ git status | |
| rebase in progress; onto 5cb0f82 | |
| You are currently rebasing branch 'feature/RED-599-Bundling' on '5cb0f82'. | |
| (all conflicts fixed: run "git rebase --continue") | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: TCS.Website/sass/fullsite/Partials/_forms.scss | |
| modified: TCS.Website/sass/fullsite/Partials/_swatches.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_product.scss | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| GIT-REBASE(1) Git Manual GIT-REBASE(1) | |
| NAME | |
| git-rebase - Forward-port local commits to the updated upstream head | |
| SYNOPSIS | |
| git rebase [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] | |
| [<upstream> [<branch>]] | |
| git rebase [-i | --interactive] [options] [--exec <cmd>] [--onto <newbase>] | |
| --root [<branch>] | |
| git rebase --continue | --skip | --abort | --edit-todo | |
| DESCRIPTION | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| ➜ tcs git:(237c56f) ✗ git add TCS.Website | |
| ➜ tcs git:(237c56f) ✗ git status | |
| rebase in progress; onto 5cb0f82 | |
| You are currently rebasing branch 'feature/RED-599-Bundling' on '5cb0f82'. | |
| (all conflicts fixed: run "git rebase --continue") | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: TCS.Website/sass/fullsite/Partials/_forms.scss | |
| modified: TCS.Website/sass/fullsite/Partials/_swatches.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_product.scss | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| ➜ tcs git:(237c56f) ✗ git add TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| ➜ tcs git:(237c56f) ✗ git status | |
| rebase in progress; onto 5cb0f82 | |
| You are currently rebasing branch 'feature/RED-599-Bundling' on '5cb0f82'. | |
| (all conflicts fixed: run "git rebase --continue") | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: TCS.Website/sass/fullsite/Partials/_forms.scss | |
| modified: TCS.Website/sass/fullsite/Partials/_swatches.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_browse.scss | |
| modified: TCS.Website/sass/fullsite/site-sections/_product.scss | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| ➜ tcs git:(237c56f) ✗ git rebase --abort | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git status | |
| On branch feature/RED-599-Bundling | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git checkout -- . | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git status | |
| On branch feature/RED-599-Bundling | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizeChart.png | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git reset --hard | |
| HEAD is now at a54b934 Fixed IE conditional, removed partnerJS from Html.Master | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git status | |
| On branch feature/RED-599-Bundling | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart.png | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git checkout -- | |
| M TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| M TCS.Website/images/sprite-src/fullsite/sizechart.png | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git reset HEAD . | |
| Unstaged changes after reset: | |
| M TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| M TCS.Website/images/sprite-src/fullsite/sizechart.png | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git status | |
| On branch feature/RED-599-Bundling | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart.png | |
| no changes added to commit (use "git add" and/or "git commit -a") | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git reset --hard . | |
| fatal: Cannot do hard reset with paths. | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git add . | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git status | |
| On branch feature/RED-599-Bundling | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| Changes to be committed: | |
| (use "git reset HEAD <file>..." to unstage) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart.png | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git reset HEAD . | |
| Unstaged changes after reset: | |
| M TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| M TCS.Website/images/sprite-src/fullsite/sizechart.png | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git stash | |
| Saved working directory and index state WIP on feature/RED-599-Bundling: a54b934 Fixed IE conditional, removed partnerJS from Html.Master | |
| HEAD is now at a54b934 Fixed IE conditional, removed partnerJS from Html.Master | |
| ➜ tcs git:(feature/RED-599-Bundling) ✗ git status | |
| On branch feature/RED-599-Bundling | |
| Your branch and 'origin/feature/RED-599-Bundling' have diverged, | |
| and have 14 and 45 different commits each, respectively. | |
| (use "git pull" to merge the remote branch into yours) | |
| Changes not staged for commit: | |
| (use "git add <file>..." to update what will be committed) | |
| (use "git checkout -- <file>..." to discard changes in working directory) | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart-2x.png | |
| modified: TCS.Website/images/sprite-src/fullsite/sizechart.png |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment