Posts Tagged ‘merge’

How to use GIT to merge two SVN branches TL;DR: Download the git-merge-svn script here I’ve been using git for years now but had to start using SVN for some projects. I found that GIT is good enough Subversion client too, especially as I retain the ability to commit often and rebase my work on […]

apr. 23rd, 2013 | Filed under Programming, Rest of the World

Or how to reset a merge commit? If just after a merge commit you recognized that it was actually “git rebase” that you wanted to do, then your friend is: git reset –merge 14c1d90c3e where the target commit is the one preceding the merge. But when reset is not an option? But if you found […]

aug. 23rd, 2010 | Filed under Programming
Tags: ,