Home/ Questions/Q 430905
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-05-12T19:55:18+00:00

I have trouble where, for some reason, SVN would only merge the newly generated

  • 0

I have trouble where, for some reason, SVN would only merge the newly generated template code to implemented code (thus overwriting whatever I had done), but not the other way around.

For example,

1) I generate a file called SomeFile.java. I commit this to trunk. I also branch this to feat1/SomeFile.java

2) I work off of the feat1/SomeFile.java (the branch). Once everything is okay, I simply commit to feat1 branch, and reintegrate to the trunk.

3) Now I need to re-generate the code again (with some changes). What I did before was I committed this to the trunk, then I tried to merge from feat1 branch to trunk. BUT for some reason SVN would not merge the files at all.

Am I doing something wrong?

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    I think reintegrate is not what you want.

    Try a normal merge. In your trunk:

    svn merge [url]/feat1
    • 0