search

sboulema / TGit

Control TortoiseGit from within Visual Studio
MIT License
31 stars 9 forks source link

GitFlow init. #20

Closed GreenKn1ght closed 8 years ago

GreenKn1ght commented 8 years ago 
> git config --add gitflow.branch.master master 
> git config --add gitflow.branch.develop devel 
> git config --add gitflow.prefix.feature feature/ 
> git config --add gitflow.prefix.release release/ 
> git config --add gitflow.prefix.hotfix hotfix/ 
> git checkout -B devel master 
Reset branch 'devel'
Your branch and 'origin/devel' have diverged,
and have 7 and 42 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)
> git push -u origin devel 
 ! [rejected]        devel -> devel (non-fast-forward)
error: failed to push some refs 
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

Error (2998 ms @ 16.08.2016 11:35:38)

Reseting devel branch and push it seems to be incorrect. I think TGit shouldn't change brach, if it existed. And push by default not expected for me.

sboulema commented 8 years ago

Will be fixed in the next version!