Home/ Questions/Q 7896819
In Process

The Archive Base Latest Questions

Editorial Team
  • 0
Asked: 2026-06-03T07:59:31+00:00

I’m using CVS through the eclipse plugin. I have a .fla and a .swf

  • 0

I’m using CVS through the eclipse plugin. I have a .fla and a .swf file which I have committed in CVS. I created a new branch and made changes in the .fla and swf files and committed them on the new branch. I want to merge the new branch with it’s root branch and switch back to the root branch but CVS is complaining and not letting do so. I am able to commit files on the development branch, but how do i merge and then switch to the root branch?

This is happening because both .fla and .swf are binary files. I know binary files are can’t be merged. But I do want to overwrite the fla & swf on the root branch with the new fla & swf from the new branch. How do I go about doing that?

Thanks

Share

Leave an answer

You must login to add an answer.

Need An Account,

1 Answer

  1. Editorial Team

    Here’s what I did and it worked.

    Development branch is where I code.
    Head is where I commit my stable releases.

    1. Switch to HEAD
    2. Right Click > Team > Merge
    3. In the pop up that opens, select development (branch in which you coded) as the end tag.
    4. select Root_development (this is the parent of the development branch, for me it was HEAD) as the start tag.
    5. Preview merge (which is already pre-selected)
    6. In the synchronization view that opens up, right click on the binary file > overwrite.
    7. Done!
    8. Commit to the HEAD or the parent branch
    • 0