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

Intellij with git - Contents have differences only in line separators

I've just installed IntelliJ IDEA with git and pulled down code from the framework. Immediately after doing this, I get hundreds (out of thousands) of files saying that 'contents have differences only in line separators'. If I change these from CRLF…
7
votes
3 answers

Need to create a PDF file from C# with another PDF file as the background watermark

I am looking for a solution that will allow me to create a PDF outfile from C# that also merges in a seperate, static PDF file as the background watermark. I'm working on a system that will allow users to create a PDF version of their invoice.…
Richard West
  • 2,166
  • 4
  • 26
  • 40
7
votes
1 answer

Git hotfix merging to master and master to develop

If I have two branches: master and develop. All the releases come from the master branch and all features are developed from the develop branch. If I create a hotfix branch from master and then merge it back to master I think I have two options from…
Marti Markov
  • 746
  • 6
  • 25
7
votes
3 answers

Does Apache NiFi support version control

I am trying to explore Apache NiFi. So far haven't seen any ways to version control flows. Is there a way to version control flows when multiple users are trying to develop in the same instance? What about code merge from multiple users? Any help…
Cal Ranjan
  • 71
  • 1
  • 2
7
votes
2 answers

Extending object's properties without overwriting them

I'm trying to extend the keys/values in target object (with the keys/values) from source object, but without overwriting existing keys/values in the target object. Meaning: var obj1 = { a: 1, b: 2 }; var obj2 = { b: 4, c: 3 }; extend(obj1,…
7
votes
2 answers

See what would be merged in one git command?

Currently, before merging a branch, I use the following commands to see what changes will be merged: base=$(git merge-base other HEAD) git diff $base other Is there a single git command to achieve this? Regards, Jochen
Jochen
  • 7,270
  • 5
  • 24
  • 32
7
votes
1 answer

issue with merge update query not performing as it should

I am trying to perform a merge update query in sql server. The table "my_table" has 4 columns "field" (character),"date"(date),"val"(numeric),"revision"(datetime) The query is as such: MERGE "my_table" AS Target USING ( VALUES…
RockScience
  • 17,932
  • 26
  • 89
  • 125
7
votes
1 answer

git: move commit before merge

My history tree currently looks like this: I'd like to apply commit b3 to branch master. Of course I could merge again branch feature into master but history will look messy with two merge commits (a6, and a4 that is just useless now): Thus, what…
ebosi
  • 1,285
  • 5
  • 17
  • 37
7
votes
3 answers

Merge conflict with myself

I had a merge conflict a while ago and had the suspicion, that it was with myself. Right now I had the same problem again and this time I'm certain, that I'm responsible for the conflict. Yesterday I made some changes to my branch commited the…
Bernd Strehl
  • 2,852
  • 4
  • 24
  • 43
7
votes
1 answer

Android Manifest How to replace Activity by Flavor Activity

How to use the manifest command "replace" to replace an activity from the main package by an activity with the same name but in a flavor package? com.name.project/main/ -ActivityA replace by com.name.project/pro/ -ActivityA
XxGoliathusxX
  • 922
  • 13
  • 34
7
votes
2 answers

merge pandas dataframe with key duplicates

I have 2 dataframes, both have a key column which could have duplicates, but the dataframes mostly have the same duplicated keys. I'd like to merge these dataframes on that key, but in such a way that when both have the same duplicate those…
dcmm88
  • 1,445
  • 1
  • 12
  • 30
7
votes
1 answer

Revert a specific commit from a merged branch that has already been pushed

I was just reading the post below and I had a question I was hoping someone would know the answer to. How to revert a merge commit that's already pushed to remote branch? So I know that I can completely revert a merge commit from my master by…
user1649972
  • 381
  • 3
  • 14
7
votes
2 answers

Git Merge only single file from master into current branch

I have just started using git. I created branch-A from master. I have created the file abc.txt in branch-A and merged branch-A into master successfully. Now I am working same file in branch-A and want to merge master's (which abc.txt) file into…
Ali Hussain Khan
  • 111
  • 1
  • 1
  • 9
7
votes
3 answers

How to use visual merging tools?

I can't get my head around KDiff3 or Beyond Compare in the merge mode. Is there any tutorial to this feature?
Jader Dias
  • 88,211
  • 155
  • 421
  • 625
7
votes
2 answers

SharePoint Online Merge Unsupported

I am trying to merge an item into an existing list in SharePoint Online, but receive the following error: "The type SP.ListItemEntityCollection does not support HTTP PATCH method." My configuration is as stated in Microsoft documentation.…
Blake Lassiter
  • 383
  • 2
  • 4
  • 18