Archives for the tag “ VersionControl ”

Stéphane Thibault >_

"Only do this on commits that haven’t been pushed an external repository. If others have based work off of the commits that you’re going to delete, plenty of conflicts can occur. Just don’t rewrite your history if it’s been shared with others."

Stéphane Thibault >_

sthibault bookmarked a link:

The basic idea of story branching (sometimes referred to as “issue-driven development”) is that you create a development branch for each and every JIRA issue you implement. Bug fixes, user stories, spikes… they all get their own branch. Madness, you say! And I would agree with you if we were still using a centralized version control system like SVN. But branching in Git is very lightweight and merges don’t lock up the entire repository, making this crazy idea quite practical.

Stéphane Thibault >_

sthibault bookmarked a link:

If you read the previous section about using git svn, you can easily use those instructions to git svn clone a repository; then, stop using the Subversion server, push to a new Git server, and start using that. If you want the history, you can accomplish that as quickly as you can pull the data out of the Subversion server (which may take a while).