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.
merge
25,239
questions
0
votes
0
answers
27
views
Gitlab Merge Request Strange Behaviour
I have 3 remote branches master, dev and Avi_dev. After completing a feature I want to merge my changes into dev but conflicts appear showing the state of files on dev before I wrote a single line of ...
- 97
0
votes
1
answer
38
views
How to handle the git situation 'Your branch and 'origin/main' have diverged...'
Following is summary of the steps follows:
User A:
Clones the repo with one main branch.
Creates a new branch and commits a new file.
Publishes the branch and pushes the changes to the remote repo.
...
- 908
0
votes
1
answer
32
views
Why `pd.merge()` still works even though the `on` column is located in the index
Consider the following example:
import pandas as pd
df1 = pd.DataFrame(
data={'A': range(5)},
index=range(10, 15),
).rename_axis(index='ID')
df2 = df1.add(100).reset_index()
print(df1)
# ...
- 317
0
votes
0
answers
36
views
Speed up for loop to merge two dataframes in pandas
This is my code:
import time
st = time.time()
# Determine the smaller DataFrame
if len(purp_expanded) <= len(demog_expanded):
smaller_df = purp_expanded
larger_df = demog_expanded
...
- 675
0
votes
0
answers
15
views
How rebasing develop after merge on master?
On my project, when devs ask for merge of feature branches on develop, the source branch is merged, and afterwards deleted, because in the Merge Requests settings, we checked Enable "Delete ...
- 949
0
votes
2
answers
27
views
Merge two datasets in a many to one framework, where dataset B's columns are a subset of dataset A's
My dataset A is a panel of individuals, as below. Many individuals can belong to a single family (variable fam_id). I have person variables and family variables in this dataset. As you can see, I have ...
- 45
-1
votes
0
answers
5
views
How can I merge two data sets with the same column names to format perfectly into a single data chart?
merge(Divvy_Trips_2019_NEW,Divvy_Trips_2020_Q1,by=c("start_time","end_time","start_station_name","start_station_id","end_station_name","...
-3
votes
0
answers
22
views
Issue with Recursive Merge Sort Implementation in Python: Unexpected Sorting Results [closed]
What are the key advantages of using TensorFlow compared to other deep learning libraries?
Looking forward to interesting opinions and perspectives
Description of actions: I attempted to implement the ...
- 1
0
votes
0
answers
21
views
Python Pandas: Select matching value from other table with comparison into each row without matching key [duplicate]
I have a structure of events happening for entities in table A.
Each event is linked to a process in table B.
Unfortunately I don't have the process ID in table A only a timestamp. Table B includes ...
0
votes
0
answers
37
views
I want to merge excel files with the same format but different numerical values, the generated excel file is corrupted
When I try to merge Excel files, the spaces and colors do not merge correctly. The formats in the excel files I uploaded are the same headings etc. Only numeric values are different. But the excel ...
0
votes
1
answer
55
views
xml.etree.ElementTree. Element object has no attribute 'nsmap'
I try to process xml data from the website https://www.marktstammdatenregister.de/MaStR/Datendownload
I downloaded some datasets for a certain technology for example Netzanschlusspunkte. First step ...
- 349
1
vote
1
answer
57
views
Show a combined diff of a merge commit, including added files by either parent branch
After doing a merge which includes changes of a coworker, I want to them, to outline wheat each of us changed and how I resolved the conflicts.
The standard way that git displays merges, however, is ...
- 3,174
1
vote
2
answers
54
views
Efficient coordinate indexing
I have a triangle list, that has XYZ cooridnates per triangle node. I need a list of nodes and a list of triangle node indices from that. Close nodes should get the same index.
My C# code is:
/...
- 626
0
votes
0
answers
27
views
Merge multidocument into 1 Document
I want to make codes to combine multidoc into 1 Doc but I'm newbe in VBA, so the code as below I copied and adjusted something but it doesn't work. Could anyone help me to fix this code.
Thank you in ...
-1
votes
0
answers
25
views
How do I add the changes I want after merging [closed]
I'm having problem with git merging. So let's say I have 2 branches master and feature-1. I have made a file in feature-1 which contains all of the source code of the feature that I'm adding. After I ...
