All items tagged: hg
-
Forking and merging on bitbucket
For some recent work I was doing with Satchmo's Fedex module, I decided to go through the process of forking on bitbucket with the eventual goal of merging this back into Satchmo tip. Over time, I've had many folks try to fork Satchmo and issue pull request back to bitbucket but some people end up with a bit of a tangled mess. This article covers a basic process for maintaing your fork.
-
Development workflow with mercurial, bitbucket and fabric
Now that I've been using mercurial and bitbucket for a while, I thought it might be useful to describe the development workflow I follow for using mercurial for branching, merging and local development. I'll also talk a bit about using fabric for deployment.