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

Merge several native DLLs into one DLL

I've got a lot of small DLLs which I would like to make into one big(er) DLL (as suggested here). I can do so by merging my projects but I would like a less intrusive way. Can several DLLs be merged into one unit? A quick search found this thread…
Motti
  • 110,860
  • 49
  • 189
  • 262
8
votes
1 answer

Hash merging method affected in Perl 5.18+ by hash order randomization?

According to the answer to this question, merging two hashes in Perl 5 can be done either with: %newHash = (%hash1, %hash2); %hash1 = %newHash; or: @hash1{keys %hash2} = values %hash2; On the other hand, Perl 5.18 will introduce per process hash…
andrefs
  • 555
  • 4
  • 14
8
votes
2 answers

merge querysets in django

I have in models.py: class Game(models.Model): players1 = models.ManyToManyField(Player, related_name='games1') players2 = models.ManyToManyField(Player, related_name='games2') def get_all_players(self): return…
imkost
  • 8,033
  • 7
  • 29
  • 47
8
votes
2 answers

Merging two/three records in rails

I want to merge two profiles into one. What is the best way to do this in Rails. I have two profiles say user1 and user2 and there are at least 30 tables associated with them. Now i want to merge them together so that there should be one profile say…
Salil
  • 46,566
  • 21
  • 122
  • 156
8
votes
2 answers

SVN merge reintegrate missing ranges but nothing to merge

Here is the riddle: C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone --dry-run svn: E195016: Reintegrate can only be used if revisions 11430 through 12384 were previously merged from…
Ryan
  • 22,332
  • 31
  • 176
  • 357
8
votes
4 answers

Using P4Merge to merge XML

My (large) company uses Perforce for most of their source control. (I can't escape this.) A coworker and I often have to work on the same XML-based file at the same time. When it comes time to merge our changes, P4Merge is often not as smart as I'd…
Phrogz
  • 296,393
  • 112
  • 651
  • 745
8
votes
3 answers

git checkout automatically merges local modifications

I tried following commands on the shell git init echo "test1" > test1.txt git add test1.txt git commit -a -m "test1" echo "test2" >> test1.txt git branch test git checkout test text.txt now contains: test1 test2 After checkout to branch test…
Razer
  • 7,843
  • 16
  • 55
  • 103
8
votes
2 answers

Combine 2 AAC files using Java

I am trying to combine 2 AAC files into one, I found out that in AAC files - the header element is present till the FF8 byte, and then next 4 bytes contain the length of the data of the AAC. I tried to maintain 1 header array , add the size of the 2…
user1718827
8
votes
1 answer

PBXBuildFile vs PBXFileReference section

What is the difference between PBXBuildFile and PBXFileReference in project.pbxproj? Does it matter if a file is listed in both of the sections? What is the policy what file in which section should get? /* Begin PBXBuildFile section */ …
János
  • 32,867
  • 38
  • 193
  • 353
8
votes
1 answer

Git: merge conflict and commit message

I merge with Git and get a conflict. After having resolved the conflicts, upon commit I will see an auto-generated commit message containing a list of files which were in conflict. What is the best-practice - should I keep this list of conflicting…
Mot
  • 28,248
  • 23
  • 84
  • 121
8
votes
3 answers

EGit : How to prevent fast-forward merge?

The company I work for gave me the project of moving their java project from CVS to Git. For several reasons, they don't want to use another tool than Eclipse. So we're stuck with EGit. I searched a lot to find a workflow adapted to our project.…
Cyril
  • 83
  • 1
  • 4
8
votes
1 answer

Conflict when attempting Undoing Changes example in Subversion

In exploring functionality in Subversion, I attempted to test the use case described in the Undoing Changes subsection of the Basic Merging section of the Branching and Merging chapter of the svnbook. I'm using version 1.6.4, but the text for that…
krosbonz
  • 185
  • 2
  • 8
8
votes
3 answers

Retroactive copy/merge

Sometimes a user will copy files using Windows Explorer and commit them when they should have performed an svn repository-level copy or a merge. Thus, SVN does not have proper tracking of these changes. Once I find out about this, the damage is…
Jason Kresowaty
  • 16,105
  • 9
  • 57
  • 84
8
votes
6 answers

How to merge >1000 xml files into one using Java

I am trying to merge many xml files into one. I have successfully done that in DOM, but this solution is limited to a few files. When I run it on multiple files >1000 I am getting a java.lang.OutOfMemoryError. What I want to achieve is where i have…
Andra
  • 687
  • 2
  • 9
  • 20
8
votes
1 answer

Mercurial: How to push a bookmarked changeset which creates a new remote head as if I was pushing a new branch?

General question. I'm trying to use bookmarks instead of branches in mercurial. The reason of it is that I don't want to have a lot of unnecessary fixed-named permanent items in branches. The problem appears when I use a separate bookmark for a new…
Igor Soloydenko
  • 11,067
  • 11
  • 47
  • 90