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

Dealing with conflicts when merging from development to master

I begun a workflow where I aim to do all new features in a development branch and the master branch will only be for production ready code. After doing the following: git checkout master git merge staging I received a bunch of conflicts looking…
Fellow Stranger
  • 32,129
  • 35
  • 168
  • 232
8
votes
1 answer

How to resolve "unmerged: ..." git status?

I have the following git status and I need to get rid of pluginA and pluginB: # Changed but not updated: # (use "git add ..." to update what will be committed) # (use "git checkout -- ..." to discard changes in working directory) # #…
Rob
  • 7,377
  • 7
  • 36
  • 38
8
votes
3 answers

Practical guide to Subversion branch merging

Preface I realise there are already a lot of questions about merging SVN branches on Stack Overflow. I have read many of them, but still haven't really found the information I'm looking for, so please read this question in it's entirety before…
Dónal
  • 185,044
  • 174
  • 569
  • 824
8
votes
1 answer

What is the simplest way to merge two classes in Intellij IDEA?

I have: class Parent {} class Child1 extends Parent{} class Child2 extends Parent{} I am using all three classes (especially child classes) everywhere in my application. Now the decision was made that child classes should be removed, instead parent…
LaRRy
  • 626
  • 5
  • 20
8
votes
7 answers

SVN Automatic merge to branch on check in

We use one branch for the our upcoming release, and trunk for the next release (later). For example: v1.1 -> v1.2 -> trunk (Where v1.1 is in production, v1.2 is the upcoming release and trunk will turn into v1.3 closer to release). While working on…
Unyttig
  • 93
  • 1
  • 2
  • 7
8
votes
3 answers

3-way merge in JavaScript or PHP

Does anyone know of an Open Source three-way merge implementation in JavaScript or PHP? I want to merge plain text files without the need to rely on any server side binaries. I found a few solutions for creating diffs, but no merge implementations.
Andreas Gohr
  • 4,617
  • 5
  • 28
  • 45
8
votes
7 answers

How do you manage .vcproj files in source control which are changed by multiple developers?

We use Subversion as our source control system and store the VisualStudio project files (vcproj) in the source control system as is normal I think. With Subversion we don't use any form of file locking, so if two developers are working on the same…
David Dibben
  • 18,460
  • 6
  • 41
  • 41
8
votes
2 answers

Using Transient Entity in Hibernate to Update/Merge an existing Persistent Object

I am dealing with a fairly complex object graph in my database. I am using XStream to serialize and deserialize this object graph which works fine. When I import an object graph of an object that exists in the database, it is initially transient,…
eipark
  • 7,442
  • 3
  • 24
  • 33
8
votes
1 answer

Is there a mercurial equivalent to gits no-fast-forward merge?

What is the mercurial equivalent to gits no-fast-forward merge (in case a fast forward would be possible)? Edit Assume you have a branch/bookmark at your head/tip of master/default: o feature | o | o master/default | ... A simple fast…
mheinzerling
  • 1,035
  • 1
  • 10
  • 31
8
votes
2 answers

How come "git pull origin master" doesn't actually change the files in my computer's directory?

I'm still quite new to GitHub, though I'm in a position where I have to actively use it. Anyway, I used "git pull upstream master" to pull and merge the latest code for the project I'm working on. I thought this command would update the actual files…
user1971506
  • 2,267
  • 4
  • 19
  • 19
8
votes
4 answers

Git refusing to merge because of changes to an unchanged file

I'm having a git problem where I want to merge a branch into master but it's refusing to merge because it thinks I have local changes to a file. Doing status shows no changes and diffing the files produces nothing. Here's the terminal output: $ git…
Mark Stickley
  • 1,000
  • 1
  • 12
  • 28
8
votes
1 answer

merge branches without commit messages

Assuming following "workflow" create branch master add + commit some files create and checkout branch dev edit and commit several times with silly commit messages checkout master merge dev branch into master branch in the last step is it possible…
Matthias
  • 3,458
  • 4
  • 27
  • 46
8
votes
2 answers

In R, Merge two data frames, fill down the blanks

Say I have these two data frames: big.table <- data.frame("idx" = 1:100) small.table <- data.frame("idx" = sample(1:100, 10), "color" = sample(colors(),10)) I want to merge them together like this: merge(small.table, big.table, by = "idx",…
brandco
  • 310
  • 2
  • 6
8
votes
2 answers

SVN partial merge best practices

I am working on a feature branch and have some changes committed to my feature branch that will affect the other developers. I would like to commit those new changes to the trunk so that nobody is left scrambling to fix the break later; however, I…
Michael Moussa
  • 4,207
  • 5
  • 35
  • 53
8
votes
3 answers

Merging xml file using java NodeList

I'm trying to merge two xml files as shown below but i can't able to get the desired output please help me thank you Java code: DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance(); domFactory.setIgnoringComments(true); …
FreshBits
  • 1,003
  • 4
  • 13
  • 25