[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: Merge/Conflict Misunderstanding

From: Simon Large <simon.tortoisesvn_at_gmail.com>
Date: Wed, 28 Nov 2012 14:28:51 +0000

On 28 November 2012 14:01, Derek Hansen <derek.hansen_at_chiefind.com> wrote:
> Hello everyone,
>
> I am very green when it comes to version control and the company I work for has decided they would like to implement it.
>
> So in my research I feel that using subversion is going to be our best way to go about doing things.
>
> I have installed TortoiseSVN and for the most part have been finding my way around it. However in my effort to "work it out" I am coming across difficulties with the merge process. No matter what it seems I do a conflict does not appear to arise.
>
> I have attached all the steps that I took in order to attempt to get an understanding of how it works.
>
> In a nutshell though:
> 1) Create repository
> 2) Add files
> 3) Commit files
> 4) Create branch (switching to branch working copy)
> 5) Change branch (try to force a conflict)
> 6) Commit branch
> 7) Switch to trunk working copy

7a) At this point you need to change the same line in trunk but to
something different.
7b) Commit to trunk.

> 8) Merge (no conflicts arise)
>
> I have been staring at section 4.20 in the TortoiseSVN manual for way to long now and have come to hope that someone will be able to see what I am doing wrong.

A conflict arises when you change the same line in both places but in
different ways AFTER creating the branch. You cannot create a conflict
by changing something in the branch alone. A conflict arises when
different changes are made to the same lines in both trunk and branch
and Subversion cannot know which one you want to use.

Simon

--
:       ___
:  oo  // \\      "De Chelonian Mobile"
: (_,\/ \_/ \     TortoiseSVN
:   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
:   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3031780
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-11-28 15:28:57 CET

This is an archived mail posted to the TortoiseSVN Users mailing list.