Earlier today Declan Lynch and I presented on source control. Unfortunately we didn’t make it through all 337 slides and, more frustratingly, had to cut short the demo that handled merge conflicts in branches. But I will be recording that in the near future for David Leedy.
But the slides below cover all details of using Git Flow (Hg Flow is the same) to create features, hotfixes and handle the merge conflict. The first part covers installing Redmine or Stash with JIRA. (Obviously 337 slides with screenshots make for a rather large file!)