The merging tag has no wiki summary.
5
votes
1answer
196 views
Why doesn't git merge adjacent lines without conflict?
I recently learned that when merging two branches in git, if there are changes on two adjacent lines git declares this a conflict. For example, if file test.txt has this content:
Line 1: A
Line 2: B
...
4
votes
3answers
147 views
Importance of diffing and merging for design specifications documentation
The context of this question is choosing tools for writing design specifications for software projects.
These documents will be written and maintained by architects and developers, I'm not talking ...
3
votes
3answers
207 views
Can we reduce confusion in line-based diff tools by annotating the code with some unique tokens?
Let's say I have
procedure1() {
--body of first procedure--
}
Then I rename it into procedure2 and create a procedure1 above it:
procedure1() {
--body of second procedure--
}
procedure2() ...
3
votes
1answer
72 views
TFS Branching Advice
I am new to Branching and Merging but I have been tasked with making future development on an application possible while still allowing bug fixes to production. Usually I am the only developer on the ...
2
votes
3answers
441 views
How can I prevent users from merging origin/X into Y in git?
Is it possible to force git to only merge remote tracking branches into the corresponding local branch? E.g. assume origin/X tracks X on origin and corresponds to local X and the same for origin/Y and ...
2
votes
2answers
78 views
Handling Difficult Distributed Version Control System Merges With Pair Programming
A common problem in my very small team workflow is handling merges from trunk/stable repositories up to feature branches which are ahead of the trunk or stable versions, but which need to track the ...
1
vote
2answers
151 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 ...
1
vote
1answer
127 views
Advantage of 2-way merge sort against n-way
It's known 2-way Merge sort takes N*logN time.
I wonder, what would be the running time if we split an array of the size N into N subarrays and then do the same thing as we would do for 2-way Merge?
...
0
votes
3answers
72 views
On merging database records, constraint violation in the intermediate table of M2M
If you are merging two or more database records from table X, that have a many-to-many relationship with table Y, how should you solve the problem of records in intermediate table Z that would violate ...
0
votes
0answers
23 views
Strategy for merging Debian changelogs
How should I merge Debian changelog entries for different changes, which were made in different branches of our version control system and ended up having the same version number?
Format of Debian ...
-2
votes
4answers
692 views
What's so difficult about SVN merges? [duplicate]
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 ...
