merging and ignoring certain directories
We have a branch A
We svn copy A to feature branch Y
We svn merge A to Y continuously
We svn copy A to branch B (and decided B would be the "trunk")
We have been merging B to Y continuously
We have been checking in jars to branch Y when making builds on Y.
Time to merge back from Y to Trunk B
We like to ignore the build artifacts in Y when merging back B.
How do we do that ?
What is the exact command ?
Would --reintegrate option help in this case ?
We may not want to delete branch Y after merging to B.
Can Y continue development and NOT cause merging issues again when we need
to merge from Y to B the 2nd time and onward.
Received on 2013-08-04 05:44:30 CEST
This is an archived mail posted to the Subversion Users