The following is a basic command to continue (part of) a Subversion repository as a git repository.
Continue reading
Continue SVN history in a git repository
Leave a reply
Archives
Abridged git repository history
It is sometimes useful to have a repository for a project that shows only the main points in history. It is possible to start from git repository with full history and create such an abridged history in a separate branch. You can do this efficiently in git by reusing the original tree objects. This post will do a walkthrough for the Mediawiki repository.
Continue reading
Handling merge conflicts with git
Like a similar post for Mercurial, this tip tries to document a list of systematic steps to handle merge conflicts with git.
Continue reading
Handling merge conflicts with Mercurial
When you encounter a merge conflict with Mercurial, things can get a little disorienting. The following is a practical list of steps to handle a merge conflict without getting lost.
Continue reading