Complex rebasing

[Tom Rodriguez]

> On Dec 8, 2016, at 10:12 AM, Andrew Haley <aph at redhat.com> wrote:
> 
> So, I forgot to ask:
> 
> What is the right way to rebase my working branch from the Graal master?
> 
> Thanks,

git pull —rebase origin master is the usual command I use followed by git mergetool to resolve the conflict, but pulling renames and adding files definitely adds to the difficulty factor.  Your files definitely shouldn’t disappear but they will be in the wrong place since you will have to rename them to the new layout.  You may be able to use something like

find graal -name \*.java | xargs perl -p -i - e “s/com.oracle.graal/org.graalvm.compiler/g”

though that will leave the imports improperly sorted.  You can ask eclipse to organize those imports for you.  Does that help any?

tom