Hi Miguel, I appreciate your willingness to help - thanks!
As it turns out, however - and you may have read this in a subsequent e-mail after you sent yours, I was able to perform a rebase without issue by switching over to another dev machine. I don't know if it was due to switching the OS Git was running on (probably unlikely), if it was because it was a different (older, in this case) version of Git I had running on the other dev machine, or if there was just some weird state on my original machine that was messing Git up, but it works now (at least on the 2nd dev machine). Thanks! Mike On Wed, Jul 29, 2015 at 3:43 AM, Miguel Ferreira < mferre...@schubergphilis.com> wrote: > Hi Mike, > > I’m willing to help you with this, but the easiest way would be for you to > point me to the repo you are working on. > This way I could actually see what’s going on. > > Anyway, from your description, all the files might be new in your modified > branch, but a file with the same name might have been introduced in the 4.5 > branch upstream. > Could that be the case? > > I can think of other situations that could result in such conflicts, for > example, when your modified branch has merges coming form other local or > remote branches. > If you could point me to your modified branch and tell me which branch yo > want to pull and rebase from, I could give it a try and let you know what I > find. > > Cheers, > \ Miguel Ferreira > mferre...@schubergphilis.com<mailto:mferre...@schubergphilis.com> > > > > On 15 Jul 2015, at 03:03, Mike Tutkowski <mike.tutkow...@solidfire.com > <mailto: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<mailto: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>*™*
