Top "Merge" questions

Git: how to reverse-merge a commit?

With SVN it is easy to reverse-merge a commit, but how to do that with Git?

git merge

Merge DLL into EXE?

I have two DLL files which I'd like to include in my EXE file to make it easier to distribute …

c# dll merge ilmerge

How to correctly close a feature branch in Mercurial?

I've finished working on a feature branch feature-x. I want to merge results back to the default branch and close …

merge mercurial branch hg-merge

Merging two images with PHP

I'm trying to merge two images together with PHP. For example... how would I go about placing image one on …

php image merge resize overlay

How can I combine hashes in Perl?

What is the best way to combine both hashes into %hash1? I always know that %hash2 and %hash1 always have …

perl dictionary hash merge

can't push to branch after rebase

We use git and have a master branch and developer branches. I need to add a new feature and then …

git merge rebase git-merge git-rebase

Trouble merging upstream changes back into my branch

I'm running into conflicts while trying to merge upstream changes back into my branch and I'm not sure how to …

git merge commit conflict partial

Revert a merge commit from a protected branch on GitHub.com

We have protected our develop branch on GitHub so that nobody downstream can push their commit directly. The commits need …

git github merge protected git-revert

How to test a merge without actually merging first

Is there any way of simulating a git merge between two branches, the current working branch and the master, but …

git merge

How to do a data.table merge operation

note: this question and the following answers refer to data.table versions < 1.5.3; v. 1.5.3 was released in Feb 2011 to resolve …

r merge data.table