StackOverflow2013

Note that there are some explanatory texts on larger screens.

plurals

POSVN how to merge similar file trees (merge two branches)
primarykey
Id
7663792
data
AcceptedAnswerId
0
AnswerCount
2
ClosedDate
CommentCount
0
CommunityOwnedDate
CreationDate
2011-10-05T15:30:03.887
FavoriteCount
0
LastActivityDate
2011-10-07T10:38:38.980
LastEditDate
2011-10-05T15:51:55.427
LastEditorUserId
782356
OwnerUserId
782356
ParentId
0
PostTypeId
1
Score
2
ViewCount
163
LastEditorDisplayName
text
Body
what I want to do: <pre><code>branch A -> part of the project, e.g: /project/module/a /project/module/a/file-1 branch B -> part of the project, e.g: /project/module/b /project/module/b/file-2 deployment branch -> merge of A and B /project/module/a /project/module/a/file-1 /project/module/b /project/module/b/file-2 </code></pre> one would think this is possible yet i can't get it to work... what happens is this: I merge A into deployment without a problem, but when i try to merge B afterwards I get a tree conflict, from what i read so far svn thinks A "deleted" B and vice versa... so thats the conflict? is svn only capable of merging basically the same tree? if i understood the concept of branches right then one is supposed to create them by copying the trunk thus copying the whole source... so putting modules (parts of the whole source/project) into a branch is not a good idea or even impossible? what i need is just adding stuff not trying to find the intersection of A and B because that in fact would not work :/ _EDIT_ merging from /project/module/a and /project/module/b does not help since a module splits into more folders, e.g: <pre><code>A: /project/module/stuff/a /project/module/things/a B: /project/module/stuff/b /project/module/things/b </code></pre> so what one wants, is to at least merge from module otherwise one would have to merge each subfolder individually which contradicts the whole automagical merging ... ? btw this structure is not my choice i have to work with it
Tags
<svn><merge><branch>
Title
SVN how to merge similar file trees (merge two branches)
singulars
PostAcceptedAnswerId
1. This table or related slice is empty.
PostParentId
1. This table or related slice is empty.
PostTypePostTypeId
1. PTQuestion
UserLastEditorUserId
1. USgreenone83
UserOwnerUserId
1. USgreenone83
plurals
PostLinksPostIdRelatedPostId
1. This table or related slice is empty.
PostLinksRelatedPostIdPostId
1. This table or related slice is empty.
PostsAcceptedAnswerId
1. This table or related slice is empty.
PostsParentIdCreationDate
1. PO
 singulars
 PostTypePostTypeId
 PTAnswer
2. PO
 singulars
 PostTypePostTypeId
 PTAnswer
VotesPostIdCreationDate
1. VO
 singulars
 PostPostId
 POSVN how to merge similar file trees (merge two branches)
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
2. VO
 singulars
 PostPostId
 POSVN how to merge similar file trees (merge two branches)
 UserUserId
 This table or related slice is empty.
 VoteTypeVoteTypeId
 VTUpMod
CommentsPostId
1. This table or related slice is empty.

Querying!

Guidance

A row detail

Detail views are divided into sections. All the information in the data section comes from columns in the selected row. The other sections display data from other, related rows.

Related data can be related in a to-one or a to-many fashion. Captions of data related in a to-many fashion link to a list view showing a filtered view of the table.

Try moving around until you find a non-empty to-many entry and click on the label to get to one. You can move back to the root by clicking on the database name in the header.