forked from hanshu830/worknotes
-
Notifications
You must be signed in to change notification settings - Fork 0
/
Copy pathSVN.txt
37 lines (19 loc) · 933 Bytes
/
SVN.txt
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
parent --+----------o------o-o-------------o-- ©¦
\ \ \ / ©¦
\ merge merge merge ©¦
\ \ \ / ©¦
feature +--o-o-------o----o-o----o-------
'sync' or 'catch-up' merge)
==========================
svn merge ^/trunk
Reintegrate Merge
=================
svn merge ^/feature
SVN SWITCH
==========
svn switch ^/branches/feature
svn switch ^/trunk
svn switch ^/branches/private/gliuzd/xgmi
Create branch
=============
svn copy [your_trunk_url] [your_feature_branch_url] -m [your_log]