svn merge functionality broken by tree conflicts
I don't know when the svn team decided to inflict tree conflicts on us but it has completely broken the merge functionality of svn.
I have a branch and I want to merge the latest changes from the trunk into the branch. I've already done one such merge, but this one fails because of a tree conflict. Here's the command:
$ svn --force merge -r 3185:3192 svn://chamar2/rx-services/SAMS .
svn: Attempt to add tree conflict that already exists
The first time I tried this merge (without the
--force) it only created the tree conflict and did not merge anything. Now it just reports the message above.
If I do
svn status on the branch working copy it shows all the files that have changes that have not been merged back to the trunk yet. Of course, the purpose of my branch is to do these changes where they are not yet in the trunk.
What were they thinking when they did this?
I haven't found any usable information on what causes tree conflicts and how I can continue to work now that svn has created these things.
Is there a way to tell svn to forget about tree conflicts and just do the merge like it used to?
I'm using a 1.6 client and an older svn server (probably 1.3.1).
Our team had a cvs repository, which we converted to svn via cvs2svn. Our repository has a main branch (let's call in main), that effectively serves as trunk (even though it was technically branched o
After I solved all merge conflicts of important files, I want to merge regardless of all left conflict files. Git should just keep the files from the branch I want to merge in (--ours). How can I do t
A few weeks ago I started making a change in my SVN repository's trunk that I thought was going to be fairly minor. After a few hours of work, realizing that the change had bigger implications than I
We have a pretty standard development process: On a new feature request/bugfix our developers create an own SVN branch develop the code there, we do several code review iterations, code review changes
I'm using git svn to merge changes from my local git repository to an SVN server. However, when I issue git svn dcommit it will actually commit any .gitignore files that I have in my source tree. This
If you have a directory with an svn:external link it in (which we use extensively at work), then whenever you merge that directory between branches, every file in the directory gets a new svn:merge-in
Hopw you will be fine and good. Can anyone tell me how to merge from one branch to another. For Example: We have two branches, DEV and INT and i want to merge from DEV to INT. What is the best way to
I have an SVN merge tree conflict that i can't figure out how to resolve and i'm hoping you guys(girls) can help out. Here's the situation: i created a branch A from trunk to do some development. The
I find it difficult to visually scan a file which has managed to accumulate conflicts, as in: <<<<<<< .working blah blah foo blah ======= blah blah blah blah >>>>>&
I'm using TortoiseSVN as my SVN client. How can I know if a file was merged in the past ? Thank you.
What is the best way to stash working tree, update the local branch and then merge the both files modified either on local and on remote branch? I'm doing as following: First, I git stash, the shortc
I'd like to merge all the changes that took place between rev 10 & the HEAD rev on http://url-of-branch-a and apply them to http://url-of-branch-b. Something like... svn merge -r 10:HEAD http://ur
I have two closely related C projects that are checked into SVN (but are not branches of a common ancestor). Let's call them Foo and Bar. They each contain a file user_param.h I would like to merge
I'm really new to SVN and seem to be missing something here... I have a SVN checkout of my trunk which is a running website. I created a branch to which I made numerous changes. I would now like to me
Is there a simple way to check if a merge/rebase will yield file conflicts, without actually performing the merge/rebase? I want to be able to decide whether to: rebase if the touched file set (mine
i am new to svn. i found when you merge branch A to branch B, svn moves all content in branch A to B, not copy. and when you copy branch a to branch c and when you do the same thing again, it gave you
I just finished resolving some conflicts due to a pull from the remote repository of my project. I know that once conflicts have been resolved you have, to my knowledge, 2 solutions : git rebase --co
Here is the riddle: C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone --dry-run svn: E195016: Reintegrate can only be used if revisions 11430 through 1238
I can't seem to make a branch and then merge trunk changes into the branch: svn copy file:///svn/project/trunk file:///svn/project/branches/feature-branch svn co file:///svn/project/branches/feature-b
I'm fairly new to Git, and have been working with it for only 3 months. We previously migrated our repositories from SVN. I'd like to be able to merge changes from the master into my dev branch withou
I have what I thought was a simple scenario - using TortoiseSVN: 1) I made a branch (B2) of an application (to work on implementing image sprites & JAWR). 2) Testing & development went on as n
I'm trying to migrate a small SVN repository w/ 2000+ revs with 10+ branches to GIT. Branches sometimes merge contents from other branches. My main choice, was obvisously to use: git svn clone -s URL
I took over a software project and decided to put everything under SVN (on Assembla) using Tortoise SVN. The trunk is under ROOT. So the trunk contained the whole application (which I tagged 1.0). For
Our (very legacy) codebase has an ActiveX Client UI which requires building and committing the binaries to SVN. We use a trunk, feature branch and tagged releases repository pattern. I wrote a NAnt s
I am puzzled by git (I've always used svn), my use case is as follows: I change File1 on my local repository while my friend changes the same file on his. Both changes are useful. He commits and pushe
As above, is it possible to export an SVN repo with history into a new Git repo and then use Git to do a merge from a branch back into the trunk?
Some complex subversion merges are coming up in my project: big branches that have been apart for a long time. Svn gives too many conflicts - and some of them seem spurious. Given that git is praised
We recently encountered a problem where a merge somehow led to all the changes leading to one parent being undone in the merge commit, and several commits have been applied after that point. All this
I want to copy the exact data/files from /trunk to /branches/xyz How can i do that? I tried to use merge from /trunk to branches/xyz but now sure whats going wrong some changes are alwasy missing in b
I have a local git repository created with git svn clone. I make a local branch, make some changes, switch back to master, git svn rebase and if it's all good, I merge my branch back into master. Then
I would like to know it is possible to identify branch to trunk (or vice verse) merge points by analyzing subversion logs? As far as I understood, svn merge operates on the local copy and when we comm
I am trying to use the svn vendor branch to upgrade the third party library. (We have modified the source code) I followed all the steps to create the vendor branch:: created the vendor branch for old
Is it possible to change commit messages using git rebase, but without having to re-resolve merge conflicts? I need to bowdlerize an older repo and I don't want to change any of the actual code, just
I recently did a svn add Foo/ which failed because there was a file (not a directory) called Foo/.svn Without really thinking, I did rm Foo/.svn; svn add Foo/ This fails because Foo is already under
After I perform a Git merge and resolve the conflicts, there are leftover .orig versions of the conflicting files. How can I automatically delete those after the conflict is successfully resolved?
How do I resolve a git merge conflict in favor of pulled changes? Basically I need to remove all conflicting changes from a working tree without having to go through all of the conflicts with a git m
This has been bugging me for a long time -- how do I properly resolve a merge conflict within the SVN properties set on a directory? Say for instance there are two developers working on a project wher
I ran git pull origin and now I have some issues with merge my branch with a master. Here's what I did: commit all changes on my branch git checkout master git pull origin master git checkout my bran
Is there any way to get a list of files that are in a (SVN) conflicted state using Tortoise SVN?
in my project I have configuration files separately in SVN. The needs to stay on the server, so I have an SVN checkout job that run before any deploy. If I want to deploy on my server a previous versi
I created a branch and then made changes to trunk which need merging into the branch. TortoiseSVN has a nice handy merge branch->trunk utility, but to do it this way round do I have to manually mer
Has anyone had the experience of moving a file in tortoise and committing successfully, only to later commit a different change and be told of a tree conflict where: the file in its original location
Is there a git hook I can use for merge conflicts? After a failed git merge, it would be great to be able to write a script that opens all files with conflicts in $EDITOR. Unfortunately the post-merge
Is there a way to resolve selected file having conflicts using p4merge in GIT? Lets say there are 25 conflicts and each conflict has to be resolved by each developer, if any developer runs 'git merget
In the svn book it says merge's --reintegrate is to merge all of the source URL's changes into the working copy. I would like to merge a branch back to the trunk. Some places say that it's absolut
I have a SVN tree is like below trunk ——-*-----*-----------------------------*--------------------*--------------------> r340 \ r344 r405 \ (bug fix) (new stable trunk) \ *--------*----------*-----
On trying to update my working copy, Xcode indicates that there are certain conflicts. A new screen comes up which shows my local file on the left and the server code on the right highlighting whateve
I tried to commit the changes. After a lot of problems and conflicts, I managed to resolved every problem. However, the code I committed is not currently on any branch (as the git status shows). How c
I'm trying to merge some hotfixes from trunk onto a branch. When I compare trunk/foo.py and branches/feature/foo.py, I see differences. Yet, when I run svn merge https://<svn server>/trunk/foo.p