Tohuwabohu excorcism

• When you are dong a merge from a project (by “rightclick project> Merge”) - you are copying the data into this project, from the remote repository, which you will choose.
  • To get the latest trunk changes into your branch: you are doing

    "rightclick checked out BRANCH Project > merge  > remote TRUNK repository"  

  • To add the branch changes into the trunk - checkout the trunk into a separate workspace, and do

    "rightclick checked out TRUNK Project> merge > REINTEGRATE > remote BRANCH repository" 

1. first create a branch, to implement your own feature on it
2. regulary do a “merge” to get the changes from the main branch (trunk), implemnted by other comrades.
   Be sure to have a clean working copy of your branch, before starting merge sync.

What	Image
Choose Team > Merge
The URL you choose - is the URL of the branch, where you want to get team changes from. It will be handled as the remote copy.
Handle the errors in the Synchronization View, or revert the changes by doing “rightclick on conflicted file > Revert”
Finally, to add your changes to the trunk - check out the trunk into a separate project, “rightclick checked out TRUNK Project> merge > REINTEGRATE > remote BRANCH repository”

Add the ignores by extensions into the config file: C:\Users\[USERNAME]\AppData\Roaming\Subversion\config

 global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo *.rej *~ #*# .#* .*.swp .DS_Store *.pmd 

Restart the clients after that.