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

merging conflicts questions

From: Diana Eftaiha <graceofrox_at_gmail.com>
Date: 2007-04-02 12:18:36 CEST

hey guys
im new to this whole branching/merging concept.
i have a 5-developer team and our work is starting to affect each others'.
we wanted a way so that everyone could develop whatever feature and be able
to publish it independantly of the others' features or bug fixes.
thing is if im working on a branch and im done with it, i now need to merge
it back to the trunk (which has also changed since the time i made my branch
and some changes are causing conflicts between my branch and the trunk).
whats the most practical way to apply the branch features to the trunk and
still have the bug fixes and whatever modifications that happened on the
trunk (sometimes the same lines in the trunk and the branch have been
modified which leaves me with conflicts and i need a quick practical way so
that both changes can still apply)

Received on Mon Apr 2 12:22:21 2007

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.