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

How to merge two branches and, automatically, ignore specific files/folders?

I have a MEAN stack project separated into two branches: Ionic and Node. The Ionic branch have all Ionic related files/folder. The front-end is created here to serve mobiles and web devices. But the code for web devices from this branch is not…
Rodmentou
  • 1,610
  • 3
  • 21
  • 39
7
votes
2 answers

Merge two data frame and replace the NA value in R

I have a main table(a), containing column: id, age, and sex. eg. a <- data.frame(id=letters[1:4], age=c(18,NA,9,NA), sex=c("M","F","F","M")) id age sex 1 a 18 M 2 b NA F 3 c 9 F 4 d NA M And I have a supplement table(b), just…
Eric Chang
  • 2,580
  • 4
  • 19
  • 19
7
votes
1 answer

GitLab unable to automerge. Merge request contains merge conflicts that must be resolved

GitLab is unable to automerge requests. All merge requests get the message "This merge request contains merge conflicts that must be resolved. You can try it manually on the command line" The message seems incorrect, and I tested this by creating a…
Mike Rynart
  • 71
  • 1
  • 1
  • 5
7
votes
3 answers

Git merge with --squash while keeping log of every commit

Initial scenario: A (master) \ B - C - D (development) What I want after merge --squash: A - E (master/development) \ / B - C - D On branch master, git log would be commit E Squashed commit of the following: commit D …
Zizheng Wu
  • 646
  • 1
  • 12
  • 21
7
votes
5 answers

Merging two branches and Git history

Please can somebody inform me what Git does in terms of history when merging two branches. If I have two branches which are both actively being developed on and both contain commits, which is similar to the following timeline: Branch #1:…
keldar
  • 6,152
  • 10
  • 52
  • 82
7
votes
2 answers

How to merge features branches to branch develop in Git?

I am new to Git and I have a simple question Though this has been asked many times in this forum, I want to restrict my question to the following scenario 1) Feature A (Files A, B and C were modified) cut from 'develop' 2) Feature B (Files A and…
Sathish Kumar
  • 2,150
  • 10
  • 29
  • 51
7
votes
10 answers

Interleaving sparse sorted arrays

I've got a set of lists of events. The events always happen in a given order, but not every event always happens. Here's an example input: [[ do, re, fa, ti ], [ do, re, mi ], [ do, la, ti, za ], [ mi, fa ], [ re, so, za ]] The input values…
Plutor
  • 2,867
  • 2
  • 25
  • 29
7
votes
2 answers

Python Pandas: Merge or Filter DataFrame by Another. Is there a Better Way?

One situation I sometimes encounter is, I have two dataframes (df1, df2) and I want to create a new dataframe (df3) based on the intersection of multiple columns between df1 and df2. For example, I want to create df3 by filtering df1 by columns…
Jarad
  • 17,409
  • 19
  • 95
  • 154
7
votes
4 answers

Merge 2 dataframes by matching dates

I have two dataframes: id dates MUM-1 2015-07-10 MUM-1 2015-07-11 MUM-1 2015-07-12 MUM-2 2014-01-14 MUM-2 2014-01-15 MUM-2 2014-01-16 MUM-2 2014-01-17 and: id dates field1 field2 MUM-1 2015-07-10 1 0 MUM-1 …
Dheeraj Singh
  • 715
  • 1
  • 12
  • 24
7
votes
4 answers

Git merge in wrong direction

I have finished a lengthy merge of a devel branch onto master, then I realised it should have been a devel update instead, meaning the direction should be master -> devel. Is it possible to change the destination of the commit, so that the arrow is…
Qwerty
  • 29,062
  • 22
  • 108
  • 136
7
votes
2 answers

Merging DataFrames on multiple conditions - not specifically on equal values

Firstly, sorry if this is a bit lengthy, but I wanted to fully describe what I have having problems with and what I have tried already. I am trying to join (merge) together two dataframe objects on multiple conditions. I know how to do this if the…
7
votes
2 answers

Git Flow process to send features for testing, only deploy specific feature to live

We are struggling with our Git Flow process, and deploying features to our Test and Live environment: We want all features that is ready for testing, be combined and deployed to the Test environment. We want to deploy only specific features to the…
David Smit
  • 829
  • 1
  • 13
  • 31
7
votes
5 answers

PHP merge arrays by value for 2 different array value

I have tried to merge two different arrays into a single array. Can any one help me please? i have array like this [0] (Array)#2 [rank] "579" [id] "1" [1] (Array)#4 [rank] "251" [id] "2" [0] (Array)#2 [size] "S" [rank] "251" [1]…
user3686600
  • 121
  • 6
7
votes
3 answers

Graphical patch utility

I have a kernel patch for a slightly different kernel version then the one I'm trying to patch. Needless to say, the patch partially fails. I can certainly fix it manually, but I was wondering maybe there is a graphical patch utility that can be…
Demiurg
  • 1,597
  • 8
  • 26
  • 40
7
votes
5 answers

How do I search within svn logs

I want to be able to search within the commit logs of svn. I know you can do that on tortoise, but couldn't find a way using the command line. We are moving to a two-tiered repository approach, so that the stable branch will only get stories fully…
Emerson
  • 935
  • 4
  • 13
  • 27