On Thursday 29 October 2009, Øyvind Harboe wrote:
> If rebase can't merge reordering of code automatically,
It won't. But on the other hand, pure reordering won't
generally create particularly painful merge issues. (It's
merge tool confusion which does that.)
When I do such things by hand, it's
>> More generally: does anyone have a great reference to
>> git branches, rebase & automatically refactored java code?
>>
>> (This would include name changes of classes, extracting methods,
>> rename of files, etc.)
>
> If you really want to strive into academic topics, you may try to
> implement
On Thu, 29 Oct 2009, Øyvind Harboe wrote:
> Maybe I'm using rebase incorrectly, but when code is reordered
> (to avoid declarations to resolve forward references), then a
> rebase will not run without requiring manual merging.
Exact.
> If rebase can't merge reordering of code automatically, then
Maybe I'm using rebase incorrectly, but when code is reordered
(to avoid declarations to resolve forward references), then a
rebase will not run without requiring manual merging.
If rebase can't merge reordering of code automatically, then I
would generally like such pervasive refactoring of code
