Questions tagged [merge]

Merging is a generic term for combining two or more related sets of data. It is commonly associated with revision control systems when reconciling multiple changes made to a revision-controlled collection of files. Merging multiple data sets is another use of this tag.

Most often, it is necessary when a file is modified by two people on two different computers at the same time. When two branches are merged, the result is a single collection of files that contains both sets of changes.

In some cases, the merge can be performed automatically, because the changes do not conflict. In other cases, a person must decide exactly what the resulting files should contain. Many revision control software tools include merge capabilities.

Merge can be used as a verb ("to merge branches"), but can also be a noun ("this merge will be difficult").

Merging multiple data sets is another use of this tag.

Merge can also refer to the Ruby Hash#merge method for merge hashes or git merge command for git revision control system.

Merge is different from join in datasets which is primarily SQL based. Difference between merge and join for SAS is here http://www2.sas.com/proceedings/sugi30/249-30.pdf and for R is here How to join (merge) data frames (inner, outer, left, right)?

See Wikipedia: Merge Version Control.

24925 questions
8
votes
2 answers

Xcode 6.0.1 crashes when merging 2 branches

Every time I try to merge a branch into another branch Xcode 6.0.1 crashes. So far I have: Tried from a different computer to merge the same branches (pushed them and pulled them before obviously) and it still crashes. Created a new branch from…
David Ben Ari
  • 2,259
  • 3
  • 21
  • 40
8
votes
2 answers

Neo4j: MERGE creates duplicate nodes

My database model has users and MAC addresses. A user can have multiple MAC addresses, but a MAC can only belong to one user. If some user sets his MAC and that MAC is already linked to another user, the existing relationship is removed and a new…
Jan Van den bosch
  • 3,542
  • 3
  • 26
  • 38
8
votes
2 answers

How to merge two icons together? (overlay one icon on top of another)

I've got two 16x16 RGB/A .ICO icon files, each loaded into a separate System.Drawing.Icon object. How would you create a new Icon object containing the merge of the two icons (one overlaid on top of the other)? Edit: I probably wasn't too clear, I…
demoncodemonkey
  • 11,730
  • 10
  • 61
  • 103
8
votes
3 answers

Groovy merge two lists?

I have two lists: listA: [[Name: mr good, note: good,rating:9], [Name: mr bad, note: bad, rating:5]] listB: [[Name: mr good, note: good,score:77], [Name: mr bad, note: bad, score:12]] I want to get this one listC: [[Name: mr good, note: good,,…
john
  • 2,572
  • 11
  • 35
  • 51
8
votes
2 answers

Merge dictionaries retaining values for duplicate keys

Given n dictionaries, write a function that will return a unique dictionary with a list of values for duplicate keys. Example: d1 = {'a': 1, 'b': 2} d2 = {'c': 3, 'b': 4} d3 = {'a': 5, 'd': 6} result: >>> newdict {'c': 3, 'd': 6, 'a': [1, 5], 'b':…
lagunazul
  • 257
  • 3
  • 5
  • 10
8
votes
1 answer

What is the behavior of ruby Hash#merge when used with a block

It does not seem to be documented very much: hsh.merge(other_hash){|key, oldval, newval| block} → a_hash http://ruby-doc.org/core/classes/Hash.html#M002880
dreftymac
  • 31,404
  • 26
  • 119
  • 182
8
votes
2 answers

Git: How to list commits on a merged branch?

This is the inverse of how to list commits on a branch but not merged branches, so I'll ask it in the same format. Let's say my git commit history looks like this: A---B---C---D---E---F master \ / X---Y---Z topic How do I list…
singingwolfboy
  • 5,336
  • 3
  • 27
  • 32
8
votes
1 answer

How do I set a default merge strategy specific to a file with Git?

This question is not iOS-specific, but I'm including the actual use case here for clarity I run an iOS project called Foobar, obviously kept under version control. Amongst the project files in the iOS project environment there's something called…
fatuhoku
  • 4,815
  • 3
  • 30
  • 70
8
votes
7 answers

What methods do wikis use for merging concurrent edits?

If two users edit the same wiki topic, what methods have been used in wikis (or in similar collaborative editing software) to merge the second user's edits with the first? I'd like a solution that: doesn't require locking doesn't lose any additions…
Sam Hasler
  • 12,344
  • 10
  • 72
  • 106
8
votes
9 answers

Merging of two arrays, store unique elements, and sorting in jQuery

var Arr1 = [1,3,4,5,6]; var Arr2 = [4,5,6,8,9,10]; I am trying to do merge these two arrays and output coming is [1,3,4,5,6,4,5,6] I have used $.merge(Arr1, Arr2); this piece to merge them. Using alert I can see the merged array like above. Now my…
Monibrata
  • 427
  • 4
  • 10
  • 25
8
votes
1 answer

Using git subtree merging, while also merging in all branches of all merged subtrees

I'd like to use a popular, open source issue tracker (Redmine) that offers git integration. Unfortunately, each project in the tracker can only be associated with one git repo. Creating multiple projects in the tracker is not my ideal setup. With…
anthony
  • 40,424
  • 5
  • 55
  • 128
8
votes
2 answers

java - merge adiacent rectangles into a polygon

I have a set of rectangles that have the same width and height and are always adiacent. I know the position of all the vertices, each one having only 4. (because is a square). This image can explain this: If there are any gaps, is ok if the…
Boldijar Paul
  • 5,405
  • 9
  • 46
  • 94
8
votes
2 answers

Merge/Branch Strategy

We are trying to implement the "Basic Dual Branch Plan" as described by the ALM Rangers in the latest Visual Studio TFS Branching and Merging Guide. From the guidance: The basic branch plan with a MAIN, DEV, and RELEASE branch enables concurrent…
RebelScum
  • 549
  • 2
  • 5
  • 19
8
votes
4 answers

How to merge large projects in Eclipse?

I've been working with branches for quite some time now, but I always used command-line tools to do the actual merging. However, now I need to do it from Eclipse only. Branching and merging being a widely used feature of SCM systems for many years…
Lóránt Pintér
  • 10,152
  • 14
  • 47
  • 53
8
votes
1 answer

Pandas DataFrame column concatenation

I have a pandas Dataframe y with 1 million rows and 5 columns. np.shape(y) (1037889, 5) The column values are all 0 or 1. Looks something like this: y.head() a, b, c, d, e 0, 0, 1, 0, 0 1, 0, 0, 1, 1 0, 1, 1, 1, 1 0, 0, 0, 0, 0 I…
Neck Beard
  • 383
  • 5
  • 8