Differences

This shows you the differences between two versions of the page.

--- subversion [2012/07/30 11:18] – skipidar
+++ subversion [2020/12/27 20:35] (current) – external edit 127.0.0.1
@@ Line 1: / Line 1: @@
+==Remember==
+  * 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 <code>"rightclick checked out BRANCH Project > merge  > remote TRUNK repository"  </code>
+    * **To add the branch changes into the trunk** - checkout the trunk into a separate workspace, and do <code>"rightclick checked out TRUNK Project> merge > REINTEGRATE > remote BRANCH repository" </code>
+==== Branching ====
+  - first create a branch, to implement your own feature on it
+  - 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 | {{http://i.imgur.com/GbQiy.png?200}} |
+|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. | {{http://i.imgur.com/RvEGV.png?200}} |
+|Handle the errors in the Synchronization View, or revert the changes by doing "rightclick on conflicted file > Revert" | {{http://i.imgur.com/xcdsN.png?200}} |
+|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"   | {{http://i.imgur.com/TPALm.png?200}} |
+==== Ignore Files for all clients ====
+Add the ignores by extensions into the config file: **C:\Users\[USERNAME]\AppData\Roaming\Subversion\config**
+<code> global-ignores = *.o *.lo *.la *.al .libs *.so *.so.[0-9]* *.a *.pyc *.pyo *.rej *~ #*# .#* .*.swp .DS_Store *.pmd </code>
+Restart the clients after that.