Top "Merge" questions

How do I create a readable diff of two spreadsheets using git diff?

We have a lot of spreadsheets (xls) in our source code repository. These are usually edited with gnumeric or openoffice.…

git version-control merge diff xls

How to conclude your merge of a file?

After I merged a file in Git I tried to pull the repository but error came up: You have not …

git merge

how to merge 200 csv files in Python

Guys, I here have 200 separate csv files named from SH (1) to SH (200). I want to merge them into a single …

python csv merge concatenation

What's a good (free) visual merge tool for Git? (on windows)

A similar question was already asked, but for Ubuntu. It would help to know if the tool is free as …

windows git version-control merge

How to merge 2 List<T> and removing duplicate values from it in C#

I have two lists List that I need to combine in third list and remove duplicate values from that lists …

c# list merge duplicates

How to resolve git status "Unmerged paths:"?

I merged branch dog into animal. When I go to commit, I get the following: Unmerged paths: (use "git reset …

git merge git-merge git-status

Gerrit error when Change-Id in commit messages are missing

I set up a branch in the remote repository and made some commits on that branch. Now I want to …

git merge branch master gerrit

Git Cherry-pick vs Merge Workflow

Assuming I am the maintainer of a repo, and I want to pull in changes from a contributor, there are …

git merge cherry-pick

What to do with branch after merge

I had two branches: master and branch1. I just merged branch1 back into master and I'm done with that branch. …

git merge branch

Python: pandas merge multiple dataframes

I have diferent dataframes and need to merge them together based on the date column. If I only had two …

python pandas dataframe merge data-analysis