All Questions
Tagged with subversion merging
13 questions
29
votes
7
answers
10k
views
Is my company merging branches wrong?
I recently came across an MSDN article about branching and merging and SCM: Branching and Merging Primer - Chris Birmele.
In the article they say 'big bang merge' is a merging antipattern:
Big Bang ...
- 433
4
votes
1
answer
665
views
Branching strategy for moving feature branch between versions
At my workplace, we use an SVN repository for the source code, which holds the main application and some other projects, and for the main application it is structured like this:
- trunk
- app
- ...
- 222
0
votes
1
answer
364
views
Automatic Resolution in SVN for CSV File
Situation
We are a large team of developers, using SVN for source control on our project. One of our files, FileTracker.cvs, is very large: it contains metadata about almost every file in our repo. ...
- 109
-2
votes
2
answers
639
views
If you decide that branching is a bad thing, then why use Git over SVN? [closed]
I have used Git and Mercurial a bit over the past ten years and appreciate and prefer them, but most of my experience is with SVN. If it is decided within a corporate programming group that branching ...
- 207
3
votes
2
answers
4k
views
One commit in two branches: what happened?
I work on a project using maven and svn.
Today after a svn update, the maven build was failing on the svn trunk. When I looked in the svn logs, I saw something strange: a commit affecting two ...
- 133
1
vote
3
answers
738
views
Is it a newbie mistake to avoid branching? [duplicate]
My team is new to versioning and we're trying to keep things simple, as to not overwhelm ourselves with tools-headaches. Also, our product can't be compiled and run locally, so our work is actually ...
11
votes
2
answers
355
views
Is the inconvenience about merging in SVN prior to v1.5 obsolete by now when lack of metadata isn't the case anymore?
I'm getting started with SVN and so many sources say that merging is very difficult in SVN as compared to DVCS tools. The most recent questions I could find here on SE are from 2012.
Sometimes there'...
2
votes
4
answers
3k
views
Proper sequence of actions for merging using SVN?
I'm totally new to CVCS (SVN specifically). I find that most resources focus very strongly on the command-line commands (irrelevant; we use Windows Explorer + TortoiseSVN) and about structure (e.g. ...
2
votes
1
answer
3k
views
Develop in trunk and then branch off, or in release branch and then merge back? [duplicate]
Say that we've decided on following a "release-based" branching strategy, so we'll have a branch for each release, and we can add maintenance updates as sub-branches from those.
Does it matter ...
0
votes
1
answer
123
views
What's the appropriate procedure for subversion merges? [duplicate]
We have a project with a few release branches and a trunk. Lately we've been adding bugfixes and new features to the release branch, while doing simultaneous infrastructure development on the trunk. ...
- 101
2
votes
2
answers
537
views
Should I merge from the same branch or from a merge?
Kind of a best practices question: is it better to merge directly from the source to other branches or is it OK to merge from a merge?
Using Subversion for source control.
Scenario:
Branch A has ...
- 133
1
vote
2
answers
1k
views
How can I avoid editing conflicts repeatedly when merging from one to branch to another?
I have an SVN repository set up like so:
trunk
branches
UAT
QA
DevelopmentTeam
programmer1
projectA
projectB
programmer2
projectC
projectD
programmer3
projectE
projectF
projectG
projectH
Each ...
- 199
28
votes
6
answers
24k
views
What's so difficult about SVN merges?
Possible Duplicate:
I’m a Subversion geek, why should I consider or not consider Mercurial or Git or any other DVCS?
Every once in a while, you hear someone saying that distributed version control ...
- 83.2k