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 to take place at an announced time... Makes branches easier to maintain... diff is also similarly "broken". I haven't found an "ignore reordered lines" a la -w == ignore whitespace changes. Any tips on how to better cope w/reordered code in merges w/git? 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.) -- Øyvind Harboe http://www.zylin.com/zy1000.html ARM7 ARM9 ARM11 XScale Cortex JTAG debugger and flash programmer _______________________________________________ Openocd-development mailing list Openocd-development@lists.berlios.de https://lists.berlios.de/mailman/listinfo/openocd-development
