Questions tagged [merge]

1

votes
2

answer
453

Views

Merge data frames stored in list into single data frame in R [duplicate]

This question already has an answer here: Simultaneously merge multiple data.frames in a list 6 answers I start with list l1, which I want to convert to output. As such, the data frames in l1 need to be merged by their first column (A). df1
milan
0

votes
0

answer
2

Views

Force a commit to have additional parents upon commit

This is related to another question of mine: Can't make a replacement ref "permanent". I need to merge three branches, but octopus merge fails (files too dissimilar) so I do it all by hand (git show branch:file > file then launch meld). However, the history is important, so I need to document that b...
Nero gris
0

votes
0

answer
7

Views

Change parent of a commit

I try to move a commit on top of another branch ignoring all changes done in target branch. Current situation is: master ↓ --A--B--C \ D--E I want to move commit E in front of C master ↓ --A--B--C--E' \ D--E with E' being identical to E except parrent is C now instead of D (this means tree of E...
Foobar
1

votes
2

answer
2.9k

Views

Resolving conflicts in SmartGit - Finding conflicting files

I have done a rebase in SmartGit. My respository is marked with a red < rebasing > in SmartGit If I try to make any new commits I get the message: Rebase: You must edit all merge conflicts and then mark them as resolved using git add. This is what my working tree looks like: I would like to resolve...
fixingstuff
1

votes
3

answer
1.2k

Views

Combine two data tables in R by a condition referring to two columns

I have two data tables that I want to merge/join based on values in two columns that can appear in reverse order in the two data tables. Here are two example data tables: library(data.table) # df1 col1
SandraA.
1

votes
1

answer
344

Views

What does git rebase use to determine common ancestor?

I know that I can use git merge-base to determine the common ancestor when performing a git merge, but it looks like this is not true for git rebase Here is my setup before rebase: master branch: A--Y--(C) and dev branch: A-----C--D (C) is the outcome of me rebasing A--C onto A--Y, same content, but...
watashiSHUN
1

votes
1

answer
322

Views

Read and merge two Yaml files

Assuming we have two yaml files master.yaml someProperty: "someVaue" anotherProperty: "anotherValue" override.yaml someProperty: "overriddenVaue" Is it possible to unmarshall, merge, and then write those changes to a file without having to define a struct for every property in the yaml file? The m...
DominicEU
1

votes
3

answer
2.8k

Views

Svn merging branch to trunk keeping the old branch

I followed following steps to merge my branch to trunk. Check out a copy of trunk: svn co svn+ssh://server/path/to/trunk Check out a copy of the branch you are going to merge: svn co svn+ssh://server/path/to/branch/myBranch Change your current working directory to “myBranch” Find the revision ...
drooooooid
0

votes
0

answer
50

Views

How do I simplify this items merge in C#?

There are objects: public class Item { public Item(int start, List period) { Start = start; Period = period; } public int Start { get; set; } public List Period { get; set;} } public class Period { public Period(List shortsData) { ShortsData = shortsData; } public List ShortsData { get; set;} } Item...
mr_blond
0

votes
0

answer
6

Views

Gitlab merge from a specific source branch

I have a branch in gitlab called devops and i want to merge my master branch with devops branch. However, i do not want any other branch to issue a merge request with devops branch. Is it possible? Basically, for devops as the target branch while merging, only master can be the source branch. Can so...
Rahul Desai
1

votes
1

answer
1.4k

Views

Merging two sorted vectors in one sorted vector

Background: General Goal take two sorted files with strings separated by white space, and bring them together in to one sorted file. Current Goal, to see if i can use the merge function or a similar function to combine two sorted vectors. I was using http://www.cplusplus.com/reference/algorithm/mer...
1

votes
2

answer
1.6k

Views

pandas.concat forgets column names

I'm trying to create a new DataFrame from columns of two existing frames but after the concat(), the column names are lost and I can't assign new ones: import pandas import datetime dt = datetime.datetime df1 = pandas.DataFrame({'value': [1.1, 2.1], 'foo': ['a', 'b']}, index=[dt(2015, 11, 1), dt(201...
Aaron Digulla
1

votes
1

answer
656

Views

Merge two PO files and overwrite matching translation rules

I'm attempting to merge two PO files. I have a base.po file that has general translations. I have an extra.po which has extra translations that I'd like to add to the base file OR overwrite translations for if there are matching translation IDs. I've tried using msgmerge: $ msgmerge extra.po base....
thanksd
1

votes
1

answer
93

Views

Merge multiple rows in SQL with tie breaking on primary key

I have a table with data like the following key | A | B | C --------------------------- 1 | x | 0 | 1 2 | x | 2 | 0 3 | x | NULL | 4 4 | y | 7 | 1 5 | y | 3 | NULL 6 | z | NULL | 4 And I want to merge the rows together based on column A with largest primary key being the 'tie br...
skeletalmonkey
1

votes
1

answer
176

Views

Git - error while merging because of local changes in master

(in topicBranch) git add . git commit -m "added new feature" git checkout master git merger topicBranch gives me the following error: error: Your local changes to the following files would be overwritten by merge: Looking at the log, the file in question is just some breakpoint related file buried d...
Alex Bollbach
1

votes
1

answer
2.1k

Views

Git mirror a repo to specific branch

our company try to fork a github project to our own git server,then we can add our own features on it. We just want to checkout a specific branch, and keep all branches and tags up to this branch, then copy(mirror ?) to our git server.
Brad
1

votes
1

answer
988

Views

using immutability-helper to $merge an array

I get the following error from the code below: Error: update(): $merge expects a target of type 'object'; got undefined I am trying to merge 2 arrays while only updating certain values in the items in the original array. For example, I want to update the status and updated properties but not the mem...
fredcicles
0

votes
0

answer
13

Views

merge two big dataframes

I have two big data frame : one containes 3M rows and the other contains 2M rows 1st dataframe : sacc_id$ id$ creation_date 0 0011200001LheyyAAB 5001200000gxTeGAAU 2017-05-30 13:25:07 2nd dataframe : sacc_id$ opp_line_id$ oppline_creation_date 0 001A000000hAUn8IAG a0WA000000BYK...
Nasri
1

votes
2

answer
622

Views

git fake merge (marking a commit as merged without a real merge) [duplicate]

This question already has an answer here: Is there a way to merge with Strategy “ours” without producing a new commit? 1 answer Assume I have the following history in my repository: E--F / A--B--C---D And I want to modify it to be this: E--F / \ A--B--C---D I don't want to modify file conten...
anton_rh
1

votes
2

answer
29

Views

Converting dataframe object to date using to_datetime

I have a data set that looks like this: date id 0 2014-01-01 11000929 1 2014-01-01 11000190 2 2014-01-01 11000216 3 2014-01-01 11000822 4 2014-01-01 11000971 5 2014-01-01 11000721 6 2014-01-01 11000970 7 2014-01-01 11000574 8 2014-01-01 11000967 9 2014-01-01 110...
crinix
1

votes
2

answer
45

Views

How to insert bulk data without changing order of item into table using merge statement

I wrote a stored procedure that can insert bulk data into table using the merge statement. Problem is that when I insert itemid 1024,1000,1012,1025 in this order, then SQL Server automatically changes order of itemid 1000,1012,1024,1025. I want to insert data that I actually pass. Here is sample co...
Manish Vadher
1

votes
3

answer
51

Views

How to merge other rows of data frame to the current row with Python/Pandas

I have a data frame that looks something like this: A1 A2 A3 A4 1001 1002 1003 1004 5001 5002 5003 5004 7001 7002 7003 7004 I would like to merge the other rows to the current row to look like this. For Eg: For the first row the first four columns remain the same but the columns...
Nishant Kumar
1

votes
2

answer
39

Views

Merging similar SQL rows

I want to merge rows base of some IF condition in SQL. My database looks like this | com_id | bom_id |fil_title ===================== | 6067 | 6070 |NULL | 6067 | 6070 |07 | 6067 | 6071 |NULL | 6067 | 6071 |07 | 6067 | 6069 |NULL What I want to achieve is | com_id | bom_id |fil_...
Toriam
1

votes
2

answer
52

Views

Git rebasing a branch that contains no new commits, no —force needed for pushing?

sorry if this question has already been awnsered but I couldn’t find the awnser. I’m here because of a pretty traumatic experience at work: I rebased master into the wrong branch and then executed a git push.. Which for a moment seemed to have screwed things up pretty bad. Now I am trying to und...
1

votes
1

answer
30

Views

merge dataframes with timestamps and intervals

I have two dataframes. df1contains number and timestamps. It is a very large set. df1.head() Out[292]: 2016-08-31 08:09:00 1.0 2016-08-31 08:11:00 7.0 2016-08-31 08:14:00 90.0 df2 contains intervals d2.head() Out[292]: start stop C 2016-08-...
00__00__00
1

votes
3

answer
3.6k

Views

Batch script to merge lines from two files into a third file

Contents of file A1: AA VV BB Contents of file A2: DD EE FF I want to merge the contents of A1 and A2 as below into A3, so that the expected data in A3 is: AADD VVEE BBFF Alternatively, the expected output in A3 may be: AA is from DD VV is from EE BB is from FF Thanks for the help. I did try and sea...
Aka
0

votes
0

answer
5

Views

Pandas dataframe Merge text rows group by ID

I have a dataframe as follows: ID Date Text 1 01/01/2019 abcd 1 01/01/2019 pqrs 2 01/02/2019 abcd 2 01/02/2019 xyze I want to merge Text by ID in Python using group by clause. I want to merge 'Text' columns by grou...
ParagS
1

votes
2

answer
1.2k

Views

Merging with TFS 2012 is trying to take across changes that have already been merged

We have a branch called "Main". In July 2012 I created a new branch from this called "Phase 3" for the next version of our project. We have been working on this since then, but from time to time some other changes get applied to Main. In May this year we performed a merge from Main to Phase 3 with...
John
1

votes
2

answer
1.8k

Views

git, merge overwrites my changes

Don't know, how to describe it in a short title... Here is my problem. We have two branches feature-100, feature-150 and the develop-branch. I'am working on 150, and need a feature from branch-100. Branch-100, is some weaks old, and were never been merged to develop. One fellow, bring the changes fr...
codeSnippet
0

votes
1

answer
13

Views

Git Master Branch Containing other branch info

This might be a default behavior but it's giving me hard time to understand. I always thought a branch must be one line, without other "branches". I made the following experiment: Init a git repo. Commit twice(m1,m2) on master branch Checkout a new branch named "dev" Commit twice(d1,d2) on dev branc...
Bai Bing
7

votes
3

answer
216

Views

Union of two pandas DataFrames

Say I have two data frames: df1: A 0 a 1 b df2: A 0 a 1 c I want the result to be the union of the two frames with an extra column showing the source data frame that the row belongs to. In case of duplicates, duplicates should be removed and the respective extra column should show both sources: A B...
Leon Rai
0

votes
0

answer
5

Views

git diff after a merge

In a situation where I merged the latest commits from master into my working branch, I understand that I can check the git diff of any file staged for commit by simply running git diff ; (or the first distinctive hexa chars for it). But...can someone tell me if there is an option, to, by default, o...
Fabien Haddadi
1

votes
1

answer
1.4k

Views

Sort and merge & sort again two arrays having different key-valued objects in Objective-C

I am confused in one of the sorting & merging problem. Let me describe my problem as follows. Step 1. I have an array. I am just writing the console log of an array to understand the structure of it. ( { id_ = 1, name_ = "some xyz name", date_ = "2012/01/24 05:25:30 AM" }, { id_ = 2, name_ = "some A...
Sagar R. Kothari
1

votes
2

answer
2.5k

Views

cleartool - merging single proc

I am trying to merge a single proc from a branch Nov12 to main. After searching in this reference I found the following should merge a copy from the branch to the main Merge version 1 on the branch into the "latest" version in the "main" branch: ct merge -to new_update.sql -insert -version /main/Nov...
mtk
1

votes
1

answer
196

Views

git merge sanity check

Developer A is working on branch 2012A I branch 2012A, and create branch 2012B I want all the new changes from 2012A, so I simply want to merge them into 2012B and carry on working. Does this look ok as a workflow? git checkout 2012A (switch to 2012A) git pull origin 2012A (update 2012A) git checko...
rix
1

votes
2

answer
240

Views

Merge next commit's changes to current commit

I am backtracking through my history to find what exactly broke iOS5.1 for my app. I've traced it to a single commit, however the commit has many files. I would like to git checkout [commit before iOS5 break] and have all of the changes from the commit that broke iOS5 (ie. the next commit) merged in...
Garrett
1

votes
1

answer
84

Views

AWK replace a column value when occurrences happen

. Hi everyone! I need to replace some values in FILE2 file with the values on FILE1 file when date and time match. FILE1 121216, 0100, 1.1, 121216, 0115, 1.0, 121216, 0130, 2.1, 121216, 0145, 1.8, 121216, 0200, 1.5, 121216, 0215, 1.3, 121216, 0230, 0.9, 121216, 0245, 1.2, FILE2 121216, 0100, 2.3, 12...
nhereveri
1

votes
2

answer
1.2k

Views

Using R to create and merge zoo object time series from csv files

I have a large set of csv files in a single directory. These files contain two columns, Date and Price. The filename of filename.csv contains the unique identifier of the data series. I understand that missing values for merged data series can be handled when these times series data are zoo objects....
user1981673
1

votes
1

answer
3.1k

Views

SSIS Merge Join component wrote 0 rows

First of all, thanks to the community for the amount of information on the site, helped me a lot with C# and SSIS. The second thing is that i'm not very good with english, so please be patient, if you don't understand something, please ask, i'll try to make it better. I got 2 OLEDB connection source...
Desu
1

votes
2

answer
157

Views

Assign values based on “insufficient” look-up table

I have to look up some scores and assign percentile value based on a fixed look-up table. I've tried to solve this problem for some time now, and I have read this and this SO thread, but without solving my problem. My problem is that the raw score can be bigger then the values in the look-up table,...
Eric Fail

View additional questions