25,255 questions
-1
votes
0
answers
11
views
Show a git merge commit in three-panel form in meld
This question shows many good ways to use git-mergetool to show the condition of files before a merge commit using meld:
Setting up and using Meld as your Git difftool and mergetool
I like the three-...
- 475
1
vote
0
answers
15
views
Merging multiple NetCDFs from Copernicus into one NetCDF in Rstudio for plotting
I am trying to merge multiple NetCDFs containing 4 dimensions (lat, lon, depth, time) into one NetCDF. Each contain the same variable (sea surface temperature or 'thetao') and the same depth value and ...
- 21
0
votes
1
answer
25
views
Merge multiple NetCDF files with `cdo` or `nco` along a dimension other than time
I have two or more NetCDF files that share a time dimension and time variable, where the time variable is the same for all the files (from the start to the end of the time period, unit, etc). The ...
- 67
1
vote
0
answers
64
views
Information Retrieval Systems: Optimizing a merging algorithm for partial indices
I am currently working on an information retrieval system for an academic course project. In this phase I am required to index a large collection of documents (107000 .nxml files) which, if you don't ...
- 53
1
vote
1
answer
52
views
Embarrassing myself with git merge - adds a bunch of files and commits to my PR that I hadn't touched
Git novice here. tl;dr: I don't understand why already merged commits end up in my PR. Going to number my steps here so people can point out where I went wrong with a number.
So I'm working on a ...
- 11
0
votes
1
answer
36
views
Combine dataframes fuzzy matching on time
I have two dataframes, dfA and dfB, whose primary key is an ID and a datetime object each stored in a column.
I wish to merge these dataframes on the ID & time if the ID is identical AND if the ...
- 33
-3
votes
0
answers
36
views
VS Git When merge show all changed part not just Conflicting part
I have two branch both base on master. And have not been synchronized with master for a long time.
But now I find a same Bug in all branches. I want to fix it in all branches
like:
original:
master:
...
- 1
1
vote
2
answers
60
views
PL SQL: inner Function within Merge is called more often than expected
I got a setup where I would like to call a function once per group and apply the result to multiple rows (multiple eans). However, the function is called as many times as I have eans. This might be ...
- 376
0
votes
0
answers
51
views
Databricks merge issue with null values
I'm merging two delta tables with databricks and one struct in the target delta table isn't merged as expected.
On the source delta table I have data as follow:
{
id: '123',
artist: {
song: {
...
- 1,758
0
votes
1
answer
57
views
How do I merge two Azure SQL data sources?
I have two tables with 1..* relation:
Table 'Product'
Id
Name
1
Product 1
2
Product 2
Table 'ProductVersion'
Id
ProductId
Published
10
1
1
11
1
0
Now I want to merge these data sources in Azure Search ...
- 17
1
vote
1
answer
56
views
How to manage sequential dependent branches in Git?
The problem:
I receive a task task-a
I create a new branch task-a-branch based on dev branch to work on task-a
I finish working on task-a and create a pull request from task-a-branch to dev
I then ...
- 4,725
0
votes
1
answer
52
views
What is leading to the infinite loop? [duplicate]
The question asks to merge 2 linked lists, each individually already in ascending order. I have tried to merge them in place but am running into infinite loops and have tried various ways but couldn't ...
0
votes
1
answer
76
views
Merging multiple json files into one [duplicate]
I'm totally new to this and I'm trying to get an import file for our time control with personal data of our employees from the hr software.
I created a PowerShell script to get the json files from the ...
- 11
2
votes
2
answers
71
views
merging irregular time ser
I want to merge multiple (>2) time series into a single object. For example, here are multiple time series (w missing data, incomplete, and irregular):
library(tidyverse)
library(zoo)
A <- ...
- 43
4
votes
1
answer
103
views
Argument "iby" instead of "by" in merge [duplicate]
In R (4.4.0), I found that the base function merge accepts an argument iby in place of by. The RGUI with vanilla setting reproduces the same result for two different computers I have.
However, when I ...
