init: ## _Command call():_ 
init:     _method start:_ getOrInitGit
init:         _ looking for git folder in /Users/torsten/Develop/git/sculptor _
init:         _ found existing git folder _
:     _method END:_ 
GitHelper: _method start:_ remoteBranchExists
GitHelper:     _ checking for branch: master _
GitHelper:     _ got 3 remote refs _
GitHelper:     _ ref name: refs/remotes/sculptor/develop _
GitHelper:     _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:     _ ref name: refs/remotes/sculptor/master _
: _method END:_ 
GitHelper: _method start:_ remoteBranchExists
GitHelper:     _ checking for branch: develop _
GitHelper:     _ got 3 remote refs _
GitHelper:     _ ref name: refs/remotes/sculptor/develop _
GitHelper:     _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:     _ ref name: refs/remotes/sculptor/master _
: _method END:_ 
# JGitFlow Log - So Mrz 02 2014 00:09:10 MEZ

  ## Configuration
    JGit Version: 3.0.0.201306101825-r
    JGitFlow Version: 0.21
    Master name: master
    Origin master exists = false
    Develop name: develop
    Origin develop exists = false
    feature name: feature/
    release name: release/
    hotfix name: hotfix/
    support name: support/
    versiontag name: 


--------------------------------------------------------------------------------

DefaultFlowReleaseManager: _ # Maven JGitFlow Plugin _
DefaultFlowReleaseManager: _ 

 _
DefaultFlowReleaseManager: _   ## Configuration _
DefaultFlowReleaseManager: _ 
 _
DefaultFlowReleaseManager: _     Maven Version: 3.1.1 _
DefaultFlowReleaseManager: _ 
 _
DefaultFlowReleaseManager: _     Maven JGitFlow Plugin Version: 1.0-alpha26 _
DefaultFlowReleaseManager: _ 
 _
DefaultFlowReleaseManager: _     args:  _
DefaultFlowReleaseManager: _     base dir: /Users/torsten/Develop/git/sculptor _
DefaultFlowReleaseManager: _     default development version: 3.0.3-SNAPSHOT _
DefaultFlowReleaseManager: _     default feature name: null _
DefaultFlowReleaseManager: _     default release version: null _
DefaultFlowReleaseManager: _     release branch version suffix: null _
DefaultFlowReleaseManager: _     tag message: tagging release ${version} _
DefaultFlowReleaseManager: _     allow snapshots: false _
DefaultFlowReleaseManager: _     auto version submodules: true _
DefaultFlowReleaseManager: _     enable feature versions: false _
DefaultFlowReleaseManager: _     enable ssh agent: false _
DefaultFlowReleaseManager: _     feature rebase: false _
DefaultFlowReleaseManager: _     interactive: true _
DefaultFlowReleaseManager: _     keep branch: false _
DefaultFlowReleaseManager: _     no build: false _
DefaultFlowReleaseManager: _     no deploy: false _
DefaultFlowReleaseManager: _     no tag: false _
DefaultFlowReleaseManager: _     pushFeatures: false _
DefaultFlowReleaseManager: _     pushReleases: false _
DefaultFlowReleaseManager: _     pushHotfixes: false _
DefaultFlowReleaseManager: _     squash: false _
DefaultFlowReleaseManager: _     update dependencies: true _
DefaultFlowReleaseManager: _     use release profile: true _
DefaultFlowReleaseManager: _ 

--------------------------------------------------------------------------------

 _
DefaultProjectHelper: _ installing ssh console credentials provider _
GitHelper: _method start:_ remoteBranchExists
GitHelper:     _ checking for branch: release/3.0.2 _
GitHelper:     _ got 3 remote refs _
GitHelper:     _ ref name: refs/remotes/sculptor/develop _
GitHelper:     _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:     _ ref name: refs/remotes/sculptor/master _
: _method END:_ 
GitHelper: _method start:_ remoteBranchExists
GitHelper:     _ checking for branch: develop _
GitHelper:     _ got 3 remote refs _
GitHelper:     _ ref name: refs/remotes/sculptor/develop _
GitHelper:     _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:     _ ref name: refs/remotes/sculptor/master _
: _method END:_ 
GitHelper: _method start:_ remoteBranchExists
GitHelper:     _ checking for branch: master _
GitHelper:     _ got 3 remote refs _
GitHelper:     _ ref name: refs/remotes/sculptor/develop _
GitHelper:     _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:     _ ref name: refs/remotes/sculptor/master _
: _method END:_ 
release-finish: ## Command call(): 
GitHelper:     _method start:_ workingTreeIsClean
GitHelper:         _ working tree is clean _
:     _method END:_ 
GitHelper:     _method start:_ remoteBranchExists
GitHelper:         _ checking for branch: release/3.0.2 _
GitHelper:         _ got 3 remote refs _
GitHelper:         _ ref name: refs/remotes/sculptor/develop _
GitHelper:         _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:         _ ref name: refs/remotes/sculptor/master _
:     _method END:_ 
GitHelper:     _method start:_ remoteBranchExists
GitHelper:         _ checking for branch: master _
GitHelper:         _ got 3 remote refs _
GitHelper:         _ ref name: refs/remotes/sculptor/develop _
GitHelper:         _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:         _ ref name: refs/remotes/sculptor/master _
:     _method END:_ 
GitHelper:     _method start:_ remoteBranchExists
GitHelper:         _ checking for branch: develop _
GitHelper:         _ got 3 remote refs _
GitHelper:         _ ref name: refs/remotes/sculptor/develop _
GitHelper:         _ ref name: refs/remotes/sculptor/feature/transformation-override _
GitHelper:         _ ref name: refs/remotes/sculptor/master _
:     _method END:_ 
release-finish:     merging 'release/3.0.2' into master...
release-finish:     ### Merge Result
Merge of revisions f6d071f2eb31db05c76e9c68256f277303152339, 92481c34cee69ed03c3e19daf191195461de2363 with base 31b4cfd8079525dbaec21711adc84584e53ad08a using strategy recursive resulted in: Failed. 
release-finish:     ** merge into master was not successful! Aborting the release... **
release-finish:     ** until JGit supports merge resets, please run 'git reset --merge' to get back to a clean state **
release-finish:     merging 'release/3.0.2' into develop...
release-finish:     ** Checkout conflict with files: 
sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/template/RootTmpl.xtend
sculptor-generator/sculptor-generator-core/src/main/java/org/sculptor/generator/template/service/ServiceEjbTestTmpl.xtend
sculptor-generator/sculptor-generator-core/src/test/resources/generator-tests/trait/trait.btdesign **