Re: [infinispan-dev] migrating changes between branches
2010/9/15 Mircea Markus <mircea.markus(a)jboss.com>:
Hi,
Using svn merge instead of diff-then-apply is better for tracking file
revisions, especially when it comes to moving/deleting files etc[1].
I think it important to use svn merge at least when files are
renamed/moved/deleted - both for a better revision tracking and for merging
correctness. Also helps with conflicts.
Thanks for the clarification, that was indeed puzzling me.
Cheers,
Sanne
Cheers,
Mircea
[1] http://gcc.gnu.org/wiki/SvnMerge
_______________________________________________
infinispan-dev mailing list
infinispan-dev(a)lists.jboss.org
https://lists.jboss.org/mailman/listinfo/infinispan-dev