gistfile1.txt

LilC:Sites corey$ cd demos.dev/
LilC:demos.dev corey$ git status
# On branch master
nothing to commit (working directory clean)
LilC:demos.dev corey$ git checkout develop
Branch develop set up to track remote branch develop from origin.
Switched to a new branch 'develop'
LilC:demos.dev corey$ git pull
Already up-to-date.
LilC:demos.dev corey$ git flow init

Which branch should be used for bringing forth production releases?
   - develop
   - master
Branch name for production releases: [master]

Which branch should be used for integration of the "next release"?
   - develop
Branch name for "next release" development: [develop]

How to name your supporting branch prefixes?
Feature branches? [feature/]
Release branches? [release/]
Hotfix branches? [hotfix/]
Support branches? [support/]
Version tag prefix? []
LilC:demos.dev corey$ git flow release start v1.2.3
Switched to a new branch 'release/v1.2.3'

Summary of actions:
- A new branch 'release/v1.2.3' was created, based on 'develop'
- You are now on branch 'release/v1.2.3'

Follow-up actions:
- Bump the version number now!
- Start committing last-minute fixes in preparing your release
- When done, run:

     git flow release finish 'v1.2.3'

LilC:demos.dev corey$ git flow release finish v1.2.3
Switched to branch 'master'
Auto-merging sites/all/themes/custom/demos_zen/css/views-styles.css
CONFLICT (content): Merge conflict in sites/all/themes/custom/demos_zen/css/views-styles.css
Removing sites/all/modules/contrib/views_rss/views/views_rss_views_fields.theme.inc
Removing sites/all/modules/contrib/views_rss/views/views_plugin_style_rss_fields.inc
Removing sites/all/modules/contrib/views_rss/views/views-view-views-rss-fields.tpl.php
Removing sites/all/modules/contrib/views_rss/views/views-rss-fields-item.tpl.php
Removing sites/all/modules/contrib/views_rss/CHANGELOG.txt
Auto-merging sites/all/modules/contrib/total_control_workflow/views/control_workflow.view
Auto-merging sites/all/modules/contrib/total_control_workflow/total_control_workflow.views_default.inc
Auto-merging sites/all/modules/contrib/total_control_workflow/total_control_workflow.module
Auto-merging sites/all/modules/contrib/total_control_workflow/total_control_workflow.info
Removing sites/all/modules/contrib/token/translations/uk.po
Removing sites/all/modules/contrib/token/translations/uk-ua.po
Removing sites/all/modules/contrib/token/translations/token.pot
Removing sites/all/modules/contrib/token/translations/sk.po
Removing sites/all/modules/contrib/token/translations/ru.po
Removing sites/all/modules/contrib/token/translations/pl.po
Removing sites/all/modules/contrib/token/translations/ja.po
Removing sites/all/modules/contrib/token/translations/hu.po
Removing sites/all/modules/contrib/token/translations/fr.po
Removing sites/all/modules/contrib/token/translations/es.po
Removing sites/all/modules/contrib/token/translations/de.po
Removing sites/all/modules/contrib/token/translations/da.po
Removing sites/all/modules/contrib/strongarm/translations/de.po
Removing sites/all/modules/contrib/features/translations/hu.po
Automatic merge failed; fix conflicts and then commit the result.
There were merge conflicts.