The merging tag has no wiki summary.
5
votes
1answer
135 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
...
2
votes
3answers
328 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 ...
0
votes
3answers
66 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 ...
-3
votes
4answers
429 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 ...
