Questions tagged [reintegration]
5 questions
12
votes
5 answers
Using git-svn to merge a svn branch back into trunk and trunk back into the branch
So I'm using git and interacting with an svn repo.
I have a svn TRUNK that looks like this:
A-B-C-D
And a svn bug_fixes branch that branches off at commit B or C:
-c-d-e-f-g-h-i
Now I need to get the cdefghi commits that are in my svn branch back…
Kzqai
- 22,588
- 25
- 105
- 137
2
votes
1 answer
Merging vs Reintergration
In svn, what is the difference between merging changes from a Branch back to Trunk and reintegrating changes from a Branch to Trunk? Does this result in the same result with no future problems?
General_9
- 2,249
- 4
- 28
- 46
1
vote
1 answer
What happens if I don't use the --Reintegrate option in Subversion 1.5?
I thought I had figured out everything I needed to know about Subversion 1.5 and was happily merging between my feature branches and the trunk.
Then I realized I've not been doing what I thought I had.
I have not been using the --reintegrate…
Rory Becker
- 15,551
- 16
- 69
- 94
1
vote
1 answer
Subclipse connection error during branch reintegration
My situation is this: I work on a java project in eclipse and use Subclipse for source control. Recently, work on a branch was completed and reintegration was attempted. However, my (shitty mobile) broadband connection decided to bug out about 75%…
Markus
- 11
- 4
0
votes
2 answers
Tortoise Svn reintegrate branch into trunk
I tried to reintegrate my branch back into the trunk according to the answers of this:
Tortoisesvn Subversion 1.8 - merge - no more reintegrate a branch option
But im getting Tree Conflicts.
This is what i have done so far:
I synchronized my branch…
deetz
- 491
- 1
- 7
- 20