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

Merge/Conflict Misunderstanding

From: Derek Hansen <derek.hansen_at_chiefind.com>
Date: Wed, 28 Nov 2012 06:01:06 -0800 (PST)

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
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.

Thanks,
Derek

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3031767

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].

CreateConflict.png Initial_Load_to_trunk_.png Initial_Load_to_trunk_finish.png Branch_Creation.png Branch_Creation_Finish.png CreateConflictDev.png Commit_CreateConflictDev_changes.png CreateConflictDev_finished.png Switch_trunk_log.png Switch_to_trunk.png Reintegrate_Merge.png Reintegrate_Merge_Test_finish.png Tree_Merge.png Tree_Merge_Finish.png
Received on 2012-11-28 15:02:13 CET

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