So, I don't know if it's because it's an older version of Git or because it's running on Ubuntu, but when I try to perform the same action on Ubuntu (with an older version of Git), it works fine. The rebase was performed there without issue.
On Tue, Jul 28, 2015 at 1:18 PM, Mike Tutkowski < mike.tutkow...@solidfire.com> wrote: > Interesting...after running "git rebase --abort" and then "git rebase > upstream/4.5" again, I have the same issue, but on a new file: > > Applying: Make a Spring Bean for ApiHelper > > Using index info to reconstruct a base tree... > > Falling back to patching base and 3-way merge... > > error: Your local changes to the following files would be overwritten by > merge: > > > plugins/api/solidfire/resources/META-INF/cloudstack/solidfire/spring-solidfire-context.xml > > Please, commit your changes or stash them before you can merge. > > Aborting > > Failed to merge in the changes. > > Patch failed at 0023 Make a Spring Bean for ApiHelper > > The copy of the patch that failed is found in: > > > /Users/mtutkowski/Documents/CloudStack/CloudStack/.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". > > On Tue, Jul 28, 2015 at 1:10 PM, Mike Tutkowski < > mike.tutkow...@solidfire.com> wrote: > >> Here's an example, Daan. I performed a "git rebase upstream/4.5" today >> and received the following (I have no local changes to overwrite, yet it >> thinks that's going to happen): >> >> Applying: Get IQN from newly created volume, store in DB, and return from >> API call >> >> Using index info to reconstruct a base tree... >> >> Falling back to patching base and 3-way merge... >> >> error: Your local changes to the following files would be overwritten by >> merge: >> >> >> plugins/api/solidfire/src/org/apache/cloudstack/solidfire/ApiSolidFireServiceImpl2.java >> >> Please, commit your changes or stash them before you can merge. >> >> Aborting >> >> Failed to merge in the changes. >> >> Patch failed at 0036 Get IQN from newly created volume, store in DB, and >> return from API call >> >> The copy of the patch that failed is found in: >> >> >> /Users/mtutkowski/Documents/CloudStack/CloudStack/.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". >> >> >> mtutkowski-LT:cloudstack mtutkowski$ git status >> >> rebase in progress; onto 8dc8e9b >> >> You are currently rebasing branch '4.5' on '8dc8e9b'. >> >> (all conflicts fixed: run "git rebase --continue") >> >> >> Untracked files: >> >> (use "git add <file>..." to include in what will be committed) >> >> >> test.patch >> >> tools/marvin/marvin/config/demo.cfg >> >> >> nothing added to commit but untracked files present (use "git add" to >> track) >> >> On Wed, Jul 15, 2015 at 1:26 AM, Daan Hoogland <daan.hoogl...@gmail.com> >> wrote: >> >>> A directory rename? If you create a patch file of your branch and >>> apply it on HEAD, does that work? >>> >>> On Wed, Jul 15, 2015 at 3:03 AM, Mike Tutkowski >>> <mike.tutkow...@solidfire.com> wrote: >>> > Hi everyone, >>> > >>> > I have a Git question that relates to a rebase problem I've been >>> seeing. >>> > >>> > I have a branch I've been working on the past six or seven weeks. >>> > >>> > As you'd expect, every now and then I update my local 4.5 branch from >>> the >>> > upstream CloudStack one and perform a rebase. >>> > >>> > The weird part is that even though all of the files in my modified 4.5 >>> > branch are new (there are no updates to any existing files or any >>> deletions >>> > of existing files), when I try to rebase on top of an updated 4.5, I >>> see an >>> > error when it tries to apply one patch (there are about 50 or so >>> commits >>> > being applied and I've typically had trouble in the middle some where). >>> > >>> > The error informs me that the patch can't be applied because it would >>> > conflict with an existing, modified file of mine (and, as such, it >>> says I >>> > should stash before doing the rebase). >>> > >>> > For one, no matter which file it refers to, the file in question is >>> not in >>> > a modified state. When I do a git status, nothing comes up modified >>> either. >>> > >>> > That being the case, I do a git rebase --continue, but get an error >>> saying >>> > that nothing's been added and so a continue can't be started. >>> > >>> > I end up having to either skip the patch (and reapply it manually once >>> the >>> > rebase is done) or perform some other hack to get past this issue. >>> > >>> > Thoughts? >>> > >>> > -- >>> > *Mike Tutkowski* >>> > *Senior CloudStack Developer, SolidFire Inc.* >>> > e: mike.tutkow...@solidfire.com >>> > o: 303.746.7302 >>> > Advancing the way the world uses the cloud >>> > <http://solidfire.com/solution/overview/?video=play>*™* >>> >>> >>> >>> -- >>> Daan >>> >> >> >> >> -- >> *Mike Tutkowski* >> *Senior CloudStack Developer, SolidFire Inc.* >> e: mike.tutkow...@solidfire.com >> o: 303.746.7302 >> Advancing the way the world uses the cloud >> <http://solidfire.com/solution/overview/?video=play>*™* >> > > > > -- > *Mike Tutkowski* > *Senior CloudStack Developer, SolidFire Inc.* > e: mike.tutkow...@solidfire.com > o: 303.746.7302 > Advancing the way the world uses the cloud > <http://solidfire.com/solution/overview/?video=play>*™* > -- *Mike Tutkowski* *Senior CloudStack Developer, SolidFire Inc.* e: mike.tutkow...@solidfire.com o: 303.746.7302 Advancing the way the world uses the cloud <http://solidfire.com/solution/overview/?video=play>*™*
