Complex rebasing

[Doug Simon]

I also have a rather large pending change on a branch where the rename is causing me headaches. Here is what I did after much googling:

dsimon at kurz-3 ~/g/graal-core> git branch
  master
* topic/non-static-options
dsimon at kurz-3 ~/g/graal-core> git fetch -p ssh://git@github.com/graalvm/graal-core.git
dsimon at kurz-3 ~/g/graal-core> git -c diff.renameLimit=3000 merge -s recursive -X rename-threshold=10% -X patience master

That leaves me in a state where I have about 282 files with conflicts (which I expected).

> On 8 Dec 2016, at 19:56, Andrew Haley <aph at redhat.com> wrote:
> 
> On 08/12/16 18:47, Tom Rodriguez wrote:
>> 
>>> On Dec 8, 2016, at 10:39 AM, Andrew Haley <aph at redhat.com> wrote:
>>> 
>>> On 08/12/16 18:29, Tom Rodriguez wrote:
>>>> git pull —rebase origin master is the usual command I use
>>> 
>>> Ah, OK.  That is very different from what I did.
>>> 
>>> I tried "git rebase" but it rebased my checked-out code from my
>>> personal master, not graalvm's real master.
>>> 
>>> My remote origin is
>>> 
>>> https://github.com/theRealAph/graal-core (branch aarch64_graal_misc_fixes)
>>> 
>>> and I want to rebase from
>>> 
>>> https://github.com/graalvm/graal-core (branch master)
>> 
>> Right, so in my example origin would be replaced with whatever you
>> named the remote for graalvm/graal-core.
> 
> I'm sorry, I don't even know what that sentence means.  I don't
> remember naming a remote for graalvm/graal-core.  How would you do
> that?

> git remote add origin ssh://git@github.com/graalvm/graal-core.git

would create an alias named ‘origin’ for the remote ssh://git@github.com/graalvm/graal-core.git

> 
>> One problem with git is that there are usually 12 ways to do the
>> same thing which complicates giving instructions to someone on how
>> to solve a problem.  Having multiple remotes makes it more
>> complicated as well.  If you have your own repo you might never use
>> master which can get out of date with upstream. 
> 
> That's right, and it has.
> 
>> My personal practice is that origin always refers to the repo I will
>> end up pushing to and my personal repo is named after my GitHub user
>> name.
> 
> Sure, and that sounds very sensible and much like what I'd like to do,
> but I have no idea how to do it.  That's the problem: too many choices
> and no single standardized set of instructions.
> 
> I'm just about managing to cope, but I'm new to Graal and Eclipse.
> Having to deal with git (and github) as well feels like cruel and
> unusual punishment.  The big reorg of the files feels like I really
> must have done something wicked in a previous life.

I feel your pain. The rename is unfortunate. However, it’s something out of our control.

-Doug