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
7
votes
1 answer

Does the git branch renaming affect branch hierarchy?

I'm working on a multi-branch project managed by GIT. Our workflow is currently this one : master |-> v1/master |-> v1/dev Note : Each developper make a "fork" of v1/dev to realise task. Potentially we have numbers of branch heritated from…
abenevaut
  • 768
  • 1
  • 9
  • 23
7
votes
5 answers

Visual Studio 2008: how to avoid project file merge hell?

When you're working on a VS C# project with multiple developers which all add new projects and files to the same solution the last one to try and check in his changes gets conflicts on the project solution file which aren't easy to merge. The…
jurgenb
  • 472
  • 4
  • 11
7
votes
5 answers

"Not Join" in R

I am looking for a quick way to do 'not join' (i.e. keep rows that didn't merge, or inverse of inner join). The way I've been doing is to use data.table for X and Y, then set key. For example: require(data.table) X <- data.table(category =…
tanvach
  • 389
  • 1
  • 5
  • 12
7
votes
3 answers

Join two maps by key

I have two maps: Map mapOne = {(1,"a"), (2, "b")}; Map mapTwo = {(1,10.0), (2,20.0)}; and I want to combine this maps into one by Integer value, so the result map is Map mapResult = {("a",10.0),…
bartektartanus
  • 15,284
  • 6
  • 74
  • 102
7
votes
1 answer

NodeJS, Merge two pdfs

Hy, i have two .pdf and i want to merge them using node, i already tried using Ghostscript, and exec from node , but GhostScript is a bit buggy, and sometimes it gives segmentation fault level 11, which i already researched and its a common bug.…
Diogo Antunes
  • 2,241
  • 1
  • 22
  • 37
7
votes
2 answers

What situations should the strategy-option flags be used in when doing a git merge? ( patience | minimal | histogram | myers )

I want to get a high quality diff and I am not worried about how long it will take, e.g. git merge --strategy-option=diff-algorithm=minimal develop From the docs, Its not clear which one is best for which situations? default, myers The basic…
Robert
  • 37,670
  • 37
  • 171
  • 213
7
votes
2 answers

Ignore files/folders on merge

I'm currently using SVN for versioning my software projects. On an ongoing project, I have the trunk, for client common features and specifications and branches, for client specific ones. Is there any way to mark some files / folders that shouldn't…
Rui Gonçalves
  • 2,423
  • 6
  • 30
  • 42
7
votes
1 answer

What does "use 'hg update' to get a consistent checkout" mean?

I accidentally ran hg update featurebranch while my working directory had changes. When it asked me to resolve merge conflicts on the first file, I immediately pressed Ctrl-C to kill the command. Now when I try to commit I get the error: abort: last…
Philip
  • 4,128
  • 5
  • 31
  • 49
7
votes
1 answer

Git squash and merge

Could anyone please tell me what the difference between these two commands: git merge --squash and git merge --no-ff
Green Ho
  • 881
  • 3
  • 14
  • 27
7
votes
1 answer

Oracle MERGE does not INSERT

I have this simple example I can't seems to get working : MERGE INTO mytable mt USING dual ON (mt.id = 'AAA' ) WHEN MATCHED THEN UPDATE SET mt.name = 'updated' WHEN NOT MATCHED THEN INSERT (mt.id , mt.name ) VALUES ('AAA', 'Gooood'…
Jalil
  • 3,150
  • 3
  • 30
  • 39
7
votes
3 answers

How do I merge two CSV files based on field and keep same number of attributes on each record?

I am attempting to merge two CSV files based on a specific field in each file. file1.csv id,attr1,attr2,attr3 1,True,7,"Purple" 2,False,19.8,"Cucumber" 3,False,-0.5,"A string with a comma, because it has…
Andy
  • 49,085
  • 60
  • 166
  • 233
7
votes
1 answer

Is it possible to merge an AppleColorEmoji.ttf into another font? (to use with Image Magick label function)

I need to write text over images using Image Magick. This text can contain emojis. The font I'm using for this obviously doesn't support any emoji symbols. Am I able to merge emoji font file into this font with some software (merge two TTFS), or I…
Alex
  • 423
  • 5
  • 6
7
votes
2 answers

Merging two dataframes on a date range in R

In R I want to merge two dataframes on a range of dates, taking all rows from the second dataframe which fall on and between two columns of dates from the first dataframe. I couldn't find a strictly R function or version of the merge function that…
Misc
  • 645
  • 1
  • 7
  • 20
7
votes
4 answers

C# N way merge for external sort

Whats the best way to implement an N way merge for N sorted files? Lets say I have 9 sorted files with 10 records each? How do I merge these files to create a big file with 90 sorted records?
user262102
  • 193
  • 3
  • 9
7
votes
1 answer

How to merge two MySQL databases of same structure

Here's my situation. I've got my current database (let's call it current_db) that is up to date, but its data are incomplete because of a recent crash. Some datas have been deleted, and this delete goes from 2 years ago to yesterday. I've got a…
lap0573
  • 453
  • 2
  • 6
  • 12