Tag: version-control

All the articles with the tag "version-control".

• svn for git-addicted or git-svn gotchas and WTFs - Part 4

  10 Jan, 2015

  Comparing SubGit and SmartGit for git-svn bridging, and using git filter-branch to rewrite SVN author history.

• Bulk cherry-picking process and magic ref CHERRY_PICK_HEAD

  2 Dec, 2014

  Using the CHERRY_PICK_HEAD ref to inspect the commit being cherry-picked during conflict resolution.

• svn for git-addicted or git-svn gotchas and WTFs - Part 3

  27 Nov, 2014

  Handling svn:mergeinfo during cherry-picks with git-svn, and updating mergeinfo metadata manually.

• svn for git-addicted or git-svn gotchas and WTFs - Part 2

  17 Nov, 2014

  Managing atomic commits and branch merging workflows when using git-svn to push changes back to Subversion.

• svn for git-addicted or git-svn gotchas and WTFs

  16 Nov, 2014

  Setting up git-svn with a non-standard Subversion repository layout, including branch and tag mappings.