Re: Git Rebase Question

Happy to know your problem is fixed. Cheers \ Miguel Ferreira mferre...@schubergphilis.com On 29 Jul 2015, at 19:34, Mike Tutkowski mailto:mike.tutkow...@solidfire.com>> wrote: Hi Miguel, I appreciate your willingness to help - thanks! As it turns ou

Re: Git Rebase Question

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

Re: Git Rebase Question

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

Re: Git Rebase Question

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.t

Re: Git Rebase Question

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 chang

Re: Git Rebase Question

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

Re: Git Rebase Question

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 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

Git Rebase Question

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