Questions tagged [merge]

1

votes
1

answer
1.2k

Views

How to merge small files in spark while writing into hive orc table

I am reading csv files from s3 and writing into a hive table as orc. While writing, it is writing lot of small files. I need to merge all these files. I have following properties set: spark.sql('SET hive.merge.sparkfiles = true') spark.sql('SET hive.merge.mapredfiles = true') spark.sql('SET hive.mer...
doitright
1

votes
2

answer
222

Views

Merge CSV in neo4j avoiding duplicates

I am Working with neo4j and an example Data-set of Movies. https://neo4j.com/developer/example-data/ I now want to import and update my database with an CSV file of grouplens https://grouplens.org/datasets/movielens/ If the movie written in the csv-file is already in the database i want to update...
user9167430
1

votes
0

answer
34

Views

Error Msg 208 while merge multiple rows in a single record

A query in SQL Server fetches around 30 records with 15 columns. I want to merge it and convert it into one record with 30*15 = 450 columns in a single records. Here is the sample code: DECLARE @SqlText NVARCHAR(MAX) = 'select * from ((SELECT ''abc'' AS ID, SUBSTRING(col1,0,10) ID_Mark, CASE WH...
Shahin P
1

votes
1

answer
505

Views

how to deal with multiple pull requests merge

Suppose I'm working on feature 1 branch, pushed my code to origin/feature1 branch and put a pull request to develop branch.Another person is working on feature 2 branch, pushed his code origin/feature 2 branch and raised a pull request at same time. when approver approves my request and merges it to...
Anwesh Valleshetti
1

votes
1

answer
763

Views

git merge: overwrite untracked files

I have a branch with some untracked files in it. I want to merge another branch onto it. The second branch contains a tracked file, which is untracked for the first branch. Following error occurs: error: The following untracked working tree files would be overwritten by merge:... Is there any possi...
ibot3
1

votes
2

answer
288

Views

ConcatRelated() - query or tables

I have similar issue to this question Combine values from related rows into a single concatenated string value. I've got two queries: This is what it looks like now without ConcatRelated(): I need to get return: I tried to use this SQL: SELECT DISTINCT Q_Fakt1.FakturaID, Q_Fakt1.DatumVystavenia, Q_F...
Miroslav Daniš
1

votes
2

answer
33

Views

git revert and pull from one branch to another

Have 2 branches (say A & B) merged the changes from A to B (executed git pull . A in branch B). There was a merge commit that happened. Now had to revert that merge on B (so did git revert -m) So due to revert, the commits from A are reverted back in B There are other commits on B done later on Now...
Sudheendra
1

votes
1

answer
84

Views

How to include MSM into a MSP with WiX

I am using WiX for building MSI and MSP. In my MSI, I have an MSM file present. I made some changes to the files in the MSM and re generated the same. Now I wanted to create a patch/MSP with the change in MSM included. Please help me to create a MSP with the updated MSM file.
Kandarpa
1

votes
1

answer
91

Views

Merge Pull Request from Upstream Branch into a Forked Repository

I'm new to git, so forgive me for any mistakes I make with my terminology. I have a forked repo. In the origin repo, someone makes a pull request containing a bunch of different commits. That pull request is then merged into the origin. I would also like that pull request, so I want it merged into m...
master565
1

votes
0

answer
49

Views

Why does github merge base into feature branch after conflict

We use feature/develop/master branches for our development. When a feature is done (Let's call it feature/123) we send a pull request to merge to the develop. Sometimes this merge has conflicts so we use Github to resolve the conflict. My question is why would github merge the entire develop branch...
MMM
1

votes
0

answer
32

Views

combining dataframes in python

I have a dataframe: >>> g.head(15) Out[13]: Date S E code Last 0 2017-11-02 22500 2017-11-10 P 195.00 1 2017-11-02 22500 2017-11-10 C 175.00 2 2017-11-02 22375 2017-11-10 P 135.00 3 2017-11-02 22375 2017-11-10 C 245.00 4 2017-11-02 22625 201...
dayum
1

votes
0

answer
54

Views

git merge --abort has left questionable untracked files

I hastily backed out of a merge with git abort --merge, where I should have reset the merge first. This has left me with some variants of an untracked file: .../file.swift.orig file_BACKUP_41466.swift file_BASE_41466.swift file_LOCAL_41466.swift file_REMOTE_41466.swift Are these safe to remove? I've...
Mississippi
1

votes
0

answer
51

Views

How to force merge a git tag?

I am trying to do git merge a tag but running into below error, earlier I had a folder with the similar name where I merged this tag ,later I had to delete and recreate and remerge but somehow git remembers I merged it earlier, how do I force merge it? username-MacBook-Pro-2:HW_4355 username$ git me...
user3682248
1

votes
0

answer
41

Views

Why GitHub pull request “back-merges” when resolving conflicts

When resolving conflicts in a pull request via Github Editor I always end up with 2 merges instead of one. Example: I want to merge unsynced changes on master (A) into feature branch Create pull request base:feature head:master (B) Github detects conflicts I resolve them using Github UI editor I mer...
BennyHilarious
1

votes
0

answer
69

Views

SVN wants to reintegrate on a sync merge

Some time ago a created a feature branch: svn cp ^/trunk ^/branches/feature This was done quite a while ago (almost 2 years). The feature branch was put on hold and I now want to recover it. So the first thing I tried was to sync up the work done in the meanwhile. In my working copy (the branch che...
Gonçalo Marrafa
1

votes
1

answer
37

Views

Install4j merge Projects

i have two seperate Projects and want to merge them to one Project. i've created a new Project and on 'Merge Project' i added both Project Files. After that on Screens & Actions i added the links to the Screens and Actions that i need from the Projects. Now i need to configure install4j to make bo...
OHA
1

votes
1

answer
60

Views

R: assign value based on criteria

I am trying to convert test scores from a psychological questionnaire in the first data set to standardized scores (range of percentiles) in another data set The test scores are one score from 9 people that took my questionnaire TestResults
Laura
1

votes
1

answer
30

Views

merge javascript object to another's root

Is there a way to merge these two object so I can get the desired output(last code snippet)? I have an object generated_calendar that has Q1-Q4 with Periods 1-12 and the weeks object within the period. var generated_calendar = { Q1 : { P1 : { WK1 : { start: '', end: '' }, WK2 : { start: '', end: ''...
Marvine Chi
1

votes
1

answer
846

Views

PYTHON: How to add a column to Excel Sheet with multiple Sheets

I am relatively new to python, and have tried a couple different methods I have seen throughout this website, but nothing seems to work with what I need. I have an excel file, with two columns of information, and multiple sheets. I would like to add a column to each of these sheets with the header...
BeMuRR187
1

votes
2

answer
141

Views

Download and merge multiple XML files with PHP, Foreach and Dom

I'm breaking my tooths since a week with this problem : i'm trying to download and merge dynamicly multiples xml files with an API. I can download all the files but i can't merge them without having multiple roots elements... It's frustrating and i don t find any suggestion. Here is my code : I got...
Sébastien
1

votes
1

answer
35

Views

python pandas check column contains item from a list

I have two data frames like vid vbull 1125 RHSA:2017:3200 1127 RHSA:2017:3205 1128 RHSA:2017:3208 1129 RHSA:2017:3209 kbid vdesc 2401 This contains details for RHSA:2017:3205 2402 This contains details for RHSA:2017:3206 2403 This contains details for...
nsr
1

votes
0

answer
32

Views

Mercurial merge losing existing lines

I'm trying to merge a branch into the trunk. Trunk has file with code added but when I merge the branch into it, the code disappears. In the branch, the file is present but code is not. I'm using TortoiseHg for the merge. 'Discard all changes from the other revision' is unchecked and there are no me...
Bill Martin
1

votes
1

answer
36

Views

Recursive copy without overwrite

I have data that looks like this: `+---------------+-------+ | groups_field | value | +---------------+-------+ | 1-1 | 2 | | 1-2-1 | 4 | | 2-1 | 3 | | 2-2-4 | 8 | +---------------+-------+` I want this data into a multi-dimensional object array, t...
Blalan
1

votes
1

answer
300

Views

Why is the complexity of merging M sorted arrays linear time?

Suppose we want to perform external sort and have M number of blocks sorted, where each block contains k comparable items such that n = Mk. k in this case also refers to the maximum number of items you can fit into memory for sorting, and n is the total number of items to sort. Then using the merge...
oldselflearner1959
1

votes
2

answer
1.1k

Views

How to merge and sort two doubly linked lists in C

I am currently working on a project that takes in two text files with data and sorts them into two separate linked lists. My next step is to create a function that takes in those two lists to merge and sort them by ID in increasing order. I have started the implementation but I am stuck and need som...
MGLL414
1

votes
0

answer
27

Views

Snakemake : multi-level json parsing

I've a json configuration file that looks like: { 'projet_name': 'Project 1', 'samples': [ { 'sample_name': 'Sample_A', 'files':[ { 'a': 'file_A_a1.txt', 'b': 'file_A_a2.txt', 'x': 'x1' }, { 'a': 'file_A_b1.txt', 'b': 'file_A_b2.txt', 'x': 'x1' }, { 'a': 'file_A_c1.txt', 'b': 'file_A_c2.txt', 'x': '...
Nicolas Rosewick
1

votes
1

answer
167

Views

Choose A as output of merging in KDiff3

Currently I've got stuck with merging files in KDiff. Let's say I have file A and B. A is in the left and B in the right. And now I want to merge file B to A, but when I click Merge Current File button, it shows merge editor with B file as an output of merging. How can I choose A as an output file?
1

votes
0

answer
48

Views

orientdb - Merge the edge, add the number of edges and details as Attrubute

I am studying the analysis method using orientdb related to traveler analysis. Not enough, but a lot of help. I want to visualize traveler X aircraft X traveler through orientdb I would like to change the query results in orientdb more clearly. In Korea, there are not many projects and materials thr...
주정남
1

votes
2

answer
289

Views

Jq: appending an object from 1 file into another file

Using jq, how can I take a json object from a file (input_02.json), and append it to output.json, while retaining everything already in output.json (e.g. an object originating from file input_01.json). The object to be appended in both cases is literally the entire contents of the file, with the fil...
John Bergqvist
1

votes
1

answer
34

Views

Merging two multiindexes together in Pandas

I have two multiindexes which I want to merge together on the indexes. Below I want to merge on Cif and ye and have both 0 columns in the al_staff dataframe. al_staff=pd.merge(new.reset_index(), staff_cost_sum.reset_index(), on=['Cif', 'ye'], how='inner').set_index(['Cif','ye']) I reset the index...
Iwan
1

votes
1

answer
655

Views

How to deal with a bugfix in GitFlow (or other process) once a release is ready to ship and merged into develop & master

From https://www.atlassian.com/git/tutorials/comparing-workflows/gitflow-workflow : Once the release is ready to ship, it will get merged it into master and develop, then the release branch will be deleted Now that the merge is done : let's say we're now facing instability in production suddenly (ho...
NicolasW
1

votes
1

answer
42

Views

Incorrect result after merge two dictionary in case when {str: dict} [duplicate]

This question already has an answer here: Dictionaries of dictionaries merge 21 answers I trying to merge 2 dictionaries which have the ability to create nested dictionaries and had an incorrect result. Code example. def merge_two_dicts(x, y): z = x.copy() z.update(y) return z def create_dict(l,...
creedqq
1

votes
0

answer
46

Views

How to merge lists of data.frame by column in r

I would merge 2 data.frame of 2 different lists (by column), if the value of a column is the same. This is my solution, but it is very slow. for(j in 1:length(s49)){ for(i in 1:length(s39)){ if(s39[[i]]$merge[1] == s49[[j]]$merge[1]){ #if che value of column 'merge' is the same merge(s39[[i]], s49[[...
litas
1

votes
1

answer
815

Views

Unable to merge unrelated branches in bitbucket

I am new to git and not super tech savvy when it comes to it. I use source tree to commit and push code. I am running into strange issues which I never did before. When I merge my branch to the master I get this 'Unable to merge, unrelated branches'. Moreover, I see strange things in my repo: The re...
RforResearch
1

votes
3

answer
49

Views

Updating old column entries from new data frame

I am working on a problem. Here is an idea of what the original 60k row data frame looks like. dataOne
Pizzamanfrank
1

votes
1

answer
136

Views

Excel: Find rows with same id occurring within 30 days of each other

I have a large excel table (25000 rows, 60 columns) with rows for each medical visit for 2000+ patients and then columns for type of visit, procedures, etc. Each row has the illness ID [DxID], patient ID [ID], and the date of visit [DxDate]. Some patients have multiple rows/visits for the same ill...
SCol
1

votes
0

answer
253

Views

Symfony 3.4 pdfmerger

By searching the web, Github, Stack overflow and etc. for a solution of my task i a haven't found a clear, simple and free way to do it. If anyone could share the knowledge I would really appreciate it. By reading similar Stack Overflow questions, got somehow even more confused... Task: - Simple web...
O. V.
1

votes
1

answer
857

Views

How to merge 2 jacoco coverage reports (.exec file) irrespective of maven life cycle

I have a jacoco plugin in my pom to get junit test coverage and I am dumping another report from a different server. How to merge these 2 jacoco coverage reports (.exec file) irrespective of maven life cycle. org.jacoco jacoco-maven-plugin 0.7.6.201602180812 prepare-agent ${project.build.directory}
user2000223
1

votes
1

answer
29

Views

Merge 2 arrays into 1 array

I've 2 arrays: {'1':'red'} {'1':'green','2':'red'} It should remove 1 = green and replace it with 1 = red. Key 2 must simply remain. So, I want an array like this: {'1':'red','2':'red'} How should I do that in PHP?
stijn bannink
1

votes
1

answer
77

Views

Merge subtree changes if different commit histories

I'm trying to use splitsh-lite to expose packages from a monorepo as manyrepos. But how can I merge a pull request made to a manyrepo back into the monorepo? splitsh-lite is a git subtree replacement and creates all new commit ids while otherwise essentially keeping the same commit history. The idea...
bebbi

View additional questions