lib/dev_flow/app.rb in dev_flow-0.3.0 vs lib/dev_flow/app.rb in dev_flow-0.3.1
- old
+ new
@@ -25,10 +25,12 @@
if @config[:local_config] and File.exists? (@config[:local_config])
info "Load local configuration from #{@config[:local_config]}"
@config = @config.merge(YAML.load(File.open(@config[:local_config], 'r:utf-8').read))
end
-
+
+ error "Do not work on master branch. Please swith to develop branch." if @git.current_branch == 'master'
+
# load roadmap into variable @roadmap
load_roadmap
# suggest user to take those tasks
@waiting = Hash.new