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
4 answers

Source Control merge button grayed out?

At my workplace we have set up GIT source control. We made a new branch off of the master and altered pretty much all of the code in a few modules. When we came to merge it the merge button in the source comparison window was greyed out? We had…
Craig
  • 556
  • 1
  • 8
  • 23
7
votes
2 answers

How can I use merge to cbind two dataframes

Suppose I have two dataframes: df1 <- data.frame(matrix(rnorm(10*10),ncol=10)) df2 <- data.frame(matrix(rnorm(10*10),ncol=10)) colnames(df1) <- 1:10 colnames(df2) <- 11:20 How do I use merge to cbind these (I already know about cbind but I am…
user2763361
  • 3,789
  • 11
  • 45
  • 81
7
votes
4 answers

How to merge (combine) 2 columns into 1 in oracle?

I have 3 textfields where user types table name and 2 column names which need to be merged. How should I merge (combine) 2 column values into 1? I use oracle 11g enterprise
abekmuratov
  • 201
  • 1
  • 3
  • 12
7
votes
1 answer

Mercurial fails to merge via command line

My mercurial installation refuses to merge via command line. Here's the output after I turn on verbose and debug. C:\src\StackOverflow>hg resolve --all --verbose --debug couldn't find merge tool codecompare_diff couldn't find merge tool…
Sklivvz
  • 30,601
  • 24
  • 116
  • 172
7
votes
2 answers

How to SVN merge two branches where same folder added to both branches

I have two different branches. trunk and a personal branch. The same folder was added to both branches at separate times. Now I want to merge my changes back into trunk but the folder already exists. For example (Merge personalDevBranch =>…
uriDium
  • 13,110
  • 20
  • 78
  • 138
7
votes
3 answers

Datatables - Merge columns together

I have these database columns, but I want them to be in one column. How would I do that? With mRender, I think? /* Address */ {"sTitle": "Address", "bVisible": true, …
ChaseC
  • 426
  • 2
  • 6
  • 18
7
votes
1 answer

Merge with Unique filtered index

So I've discovered a strange SQL Server behavior today. Suppose I have a table like this, id is primary key ╔════╦══════╦════════╗ ║ id ║ name ║ active ║ ╠════╬══════╬════════╣ ║ 1 ║ a ║ 0 ║ ║ 2 ║ a ║ 1…
Roman Pekar
  • 107,110
  • 28
  • 195
  • 197
7
votes
1 answer

How to git merge --squash so that github "network" diagram shows the merge

Assuming you have this: master: o--o--o development: `o--o--o I want to merge the changes back as one commit (avoiding all the junk commits along the way): git checkout master git merge --squash development But then the github network…
Jay
  • 19,649
  • 38
  • 121
  • 184
7
votes
0 answers

When committing, how to automatically populate Log Message dialog with merge log message from "Recent Messages"?

I am using TortoiseSVN 1.8.2. In a nutshell, my goal is to automatically generate a log message when committing merged revisions with a merge log template. I am first creating a merge log template for my project by going to TortoiseSVN->Properties…
Maher D
  • 71
  • 4
7
votes
3 answers

Merge Two Arrays in R

Suppose I have two arrays, array1 and array2, that look like array1 45 46 47 48 49 50 1.0 1.5 1.3 1.2 0.9 1.1 array2 45 46 47 48 49 50 2.5 5.5 4.5 5.8 1.5 8.4 and I want…
user2543427
  • 123
  • 2
  • 2
  • 7
7
votes
5 answers

What's the fastest way to merge multiple csv files by column?

I have about 50 CSV files with 60,000 rows in each, and a varying number of columns. I want to merge all the CSV files by column. I've tried doing this in MATLAB by transposing each csv file and re-saving to disk, and then using the command line to…
ankit
  • 350
  • 2
  • 7
  • 12
7
votes
1 answer

merge vectors of a list using row names in R

I have a list containing 5 matrices, each of different size and I would like to merge all of them using the row names. Here is a reproducible example of my list (I am using igraph_0.6.5-2 on R version 3.0.1): x <- list( …
Charlie
  • 109
  • 1
  • 5
7
votes
0 answers

Is there any way to merge in a visual merge tool on windows that simultaneously shows annotations?

I am using Mercurial, but I imagine that any merge tool that is aware of the version control system below it could do several things that a merge tool which is not aware of the version control system and only sees two "files" in two different…
Warren P
  • 65,725
  • 40
  • 181
  • 316
7
votes
2 answers

Is it possible to replace TortoiseSVN's merge algorithm with a "better" one?

Using the merge functionality in SVN (through TortoiseSVN) since a few month, I have the feeling that SVN reports way too often that a conflict occurs. So I am looking for a way to make (Tortoise)SVN more often resolve conflicts automatically…
Uwe Keim
  • 39,551
  • 56
  • 175
  • 291
7
votes
2 answers

Can Mercurial merge a named-branch that isn't a head?

Basically, I have dev branch, and what I like to do is to create a feature branch while I implement something, and then merge it back. So situations like the following occurs a b c d - dev / e f - feature Since dev isn't a head, is it still…
Calyth
  • 1,673
  • 3
  • 16
  • 26
1 2 3
99
100