Questions tagged [merge]

1

votes
1

answer
1.3k

Views

R merge pdf into one pdf

I have a folder which contains around 400 .pdf files, each .pdf file is 2 pages total. All .pdf file names are under the following format: 148-c16631-27-02-2018.pdf What I would like is to merge under one pdf file, the pdf files that have a certain code in the file name in R. For instance: 148-c166...
KRStam
1

votes
2

answer
203

Views

Is there a way to specify a default option for merging a pull request in GitHub?

I'm working on a project where 'squash and merge' is the preferred approach for merging pull requests. Is there a way to make this the default option in GitHub, either for my own user, or for the project? As it stands, it's entirely too easy to select the default option (Create a merge commit). Th...
M. Justin
0

votes
1

answer
11

Views

Optimizing SSIS package for millions of rows with Order by / sort in SQL command and Merge Join for millions of rows

Hi i am currently trying to optimize an SSIS package when i do an Upsert/delete which handels about 93+ million rows from a table in a remote MariaDB source. The table also contains approximately 63 columns. Currently i'm using Sort and Merge Join in my package but as i've read some guides its recom...
John
0

votes
0

answer
2

Views

Can I get three-way *word* diffs using e.g. dwdiff with diff3?

I know there are GUI's that show word-diffs in three-way diffs, but is there a command-line way I can show three-way diffs with word-higlighting the same way that I can get two-way diffs word-higlighted with diff -u a b | dwdiff -u ?
unhammer
1

votes
0

answer
9

Views

How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

When a Git merge stops due to conflicts or because the user asked for it by using the --no-commit option, the merge is considered to be still in progress, what is indicated by the existence of the file $GIT_DIR/MERGE_HEAD. This state typically ends when the merge result is committed or the merge is...
Jürgen
1

votes
2

answer
41

Views

Pandas: split cell and append data to another cell

ok i am trying to split a cell in a csv and take the second half of the information and append it to another cells data. i can split the cell but then the data i want just vanishes. this code works to split the cells import pandas as pd data = pd.read_csv('/root/v-unit/calendar_data.csv') data['St...
stcoyle
1

votes
2

answer
46

Views

python pandas dataframe groupby or pivot_table

Example: import pandas as pd data = {'id':[101,101,101,101,102,102,102,102], 'day':[1,2,1,2,1,2,1,2], 'year':[2011,2011,2012,2012,2011,2011,2012,2012], 'avg':[0.500,0.400,0.300,0.200,0.555,0.455,0.355,0.255], 'sum':[1, 2, 2, 3, 6, 6, 8, 9], 'div':[2, 1, 3, 2, 6, 1, 6, 3]} df = pd.DataFrame(data) df...
YilGuk Seo
1

votes
2

answer
25

Views

Push modifications from a downloaded git repo

A colleague started working in one of our git repositories by downloading the project from gitlab instead of doing a checkout. I want to commit/push his modifications, but it's problematic and I'm not sure what the best course of action is (I'm not a git expert either). git status shows every file a...
dargaud
1

votes
1

answer
90

Views

Merge 3 columns based on unique values?

I am trying to do a merge on 3 columns to a single one. The column values are separated by ';' and the new column need to unzip all the 3 column values and put the unique values. I know how to perform the merge column. But I am struggling to do unzipping the row value in 3 columns and finding unique...
johnsmith0
1

votes
2

answer
17

Views

Merging datasets of which only some columns match

I want to merge about 27 different datasets. For each of these datasets there are many identical columns, but also many columns that are not identical. I would like the identical columns to 'stack' while the non-identical columns are simply added. Let's assume that datasets 1 and 2 look as follows:...
Tom
1

votes
2

answer
20

Views

Turning a presence-absence matrix into a single variable per row in R

I have a presence absence matrix (comprised of 1s and 0s) for each individual ID. It is based on mark recapture data. Each column represents a sampling date. As a data frame, it looks like this (first 3 rows): ID X X.1 X.2 X.3 X.4 X.5 Sex 2014-001 0 0 1 0 1 0 F 2014-002 0 0...
N. J.
1

votes
2

answer
24

Views

pandas map a series to another series by 2 columns of a dataframe

Let's say I have a dataframe with 2 columns: indexes = pd.Series(np.arange(10)) np.random.seed(seed=42) values = pd.Series(np.random.normal(size=10)) df = pd.DataFrame({'unique_col': indexes, 'value': values}) # df: unique_col value 0 0 0.496714 1 1 -0.138264 2 2...
Rocky Li
0

votes
1

answer
27

Views

How to check if values of column 1 in dataframe B are between the values of column 1 and 2 in dataframe A. If true, return column 2 of dataframe A

I have two dataframes. Dataframe A has five columns: start_time, end_time, ID_user, ID_position and orientation. Dataframe B has four columns: timestamp, ID_user, ID_sender and RSSI. I want to add the ID_position column of dataframe A to dataframe B, so I know which RSSI value (dataframe B) corresp...
user11410373
0

votes
0

answer
7

Views

Git Selective merge

I have a master branch 'A' and a feature branch 'B'. Now a file called 'X' has evolved with some changes in both 'A' and 'B' branches. How do I create a third branch 'C' ( From Master 'A') where I can get the file 'X', having both the changes from branch 'A' and branch 'B'. And also I don't need...
athavan kanapuli
0

votes
0

answer
15

Views

GitHub pull requests produces a merge commit and the branch's commits

I recently merged a pull request on GitHub with a merge commit, and it produced a merge commit as expected, but also added the commits from the branch, which we don't want. We were using the 'Squash and merge' option before which only added one commit when merging the PR (as desired), but this meant...
SamTebbs33
0

votes
4

answer
21

Views

How do I merge lines from a file I import in Python?

I have a file (nameOfTheFile.txt) containing the following data : -200.0000 23.0786 0.2402 0.9807 2.7610 0.7627 0.3168 1.4249 0.8745 0.4953 1.4652 5.9483 0.0000 0.6919 2.2648 0.3407 0.0000 0.6958 0.5775 0.0000 0.6171 2.6211 -199.9800 23.0706...
nassbs
3

votes
1

answer
143

Views

In GitHub,update one branch to match another branch

So here's the deal: For each of our 50+ repositories, we have a three-tiered branch model: Dev, Test, Master. Dev can be updated whenever the Devs want, and changes are aggregated by a team lead and submitted for deployment to our test environment, at which time the code is merged to the test branc...
MarkTO
1

votes
2

answer
2.3k

Views

Best practices for using git in large project

Abstract I'm currently working on a large project being developed by several teams with more than 50 developers in total. We're trying to exploit every tiny bit of known methodologies in order to make our delivery process smooth and predictable (Scrum, code freezes, planning meetings, retrospective...
Lu4
3

votes
3

answer
50

Views

Does Git keep a record of past merge conflicts?

I'd like to look at the repository history and see what types of merge conflicts have occurred in the past. My team lead is skeptical of feature branching workflows because he thinks that merge conflicts will always crop up and be hard to resolve. We currently commit directly to master and push/pull...
Stu
1

votes
1

answer
2k

Views

iOS - Merge two video into single video file with audio

I want to merge 2 video files with single file with audio. I am able to merge 2 video files, but after merging ouptut video file does not have any audio sound. Even both old video file have proper audio.I have follow this tutorial: https://www.raywenderlich.com/13418/how-to-play-record-edit-videos-i...
Ravi
1

votes
4

answer
340

Views

How to see changed files after calling git fetch

If two people are working on the same repository on github and the same branch master. Then say person A pushes their change to master and I as person B, how do I check the files changed in after calling git fetch? If I do: git fetch git merge master origin/master I get this line: [email protected]
hidar
1

votes
2

answer
38

Views

git merge/rebase/cherrypick skipping commits on master

I have the following situation: _____________G ..myBranch / / S---B---C1---C2---C3---C..---C230 .. master S=working version B=bad version of task G=good version of task C=commit after B and I would like to commit and merge the master into myBranch without using B and then merge myBranch into master...
Applecow
1

votes
2

answer
78

Views

Merge two complex JSON objects with arrays

I have the two following json as input: { 'one': { 'vars': [ { 'name': 'a', 'value': 'a' }, { 'name': 'b', 'value': 'b' } ] }, 'two': { 'vars': [ { 'name': 'c', 'value': 'c' }, { 'name': 'd', 'value': 'd' } ] }, 'extras': 'whatever' } { 'one': { 'vars': [ { 'name': 'e', 'value': 'e' }, { 'name': 'f'...
aaaaahaaaaa
1

votes
1

answer
39

Views

Desktop Bridge - Upgrade Settings not working

I am trying to upgrade the user settings if my app gets updated. I am storing settings ins Properties.Settings.Default. As suggested in other answers a way to merge settings between version is to can create a bool setting UpgradeRequired and do the following. if (Properties.Settings.Default.UpgradeR...
Johannes
1

votes
2

answer
50

Views

How to merge only a specific data frame column in pandas?

I've been trying to use the pd.merge function properly but I either receive an error or get the table formatted in a way I don't like. I looked through the documentation but I can't find a way to only merge a specific column. For instance lets say I'm working with these two dataframes. df_1 = county...
prime90
1

votes
2

answer
24

Views

Merged git branches that should be equal have lots of differences actually

I have inherited a project from a previous developer at my company. There's a master branch and a, say, foo branch. Gitk shows the last commit was a merge of foo into master, so they should be equal. In fact, if I try to do such a merge again by executing: git merge foo on the master branch, it will...
Fran Marzoa
1

votes
1

answer
38

Views

How can i get there would be conflict if you merge two branch usign git command

I am trying to merge two branch without conflict in my script. but if there is any conflict i do not want to fire git merge command, merge two branch. So is anyway that i can check before fire merge command there is any conflict or not?
paras chauhan
1

votes
2

answer
34

Views

Undo git Auto-merge

After I switched branches, I applied stash (as below), which resulted in an auto-merge.  git stash apply Auto-merging src/clojure/project_src.clj On branch upgrade_project Changes not staged for commit: (use 'git add ...' to update what will be committed) (use 'git checkout -- ...' to discard c...
Snehaa Ganesan
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

View additional questions