Trying to finish feature

GreenKn1ght commented 8 years ago

> git checkout devel 
M   (**submodule** path)
Your branch is up-to-date with 'origin/devel'.
Switched to branch 'devel'
> git pull 
Already up-to-date.
> git merge --no-ff feature/MS-712 **(it must be WMS-712)**
merge: feature/MS-712 **(Again)** - not something we can merge

Error (2919 ms @ 15.08.2016 11:59:33)

So, in my case submodule changed without creating new branch and now with head on devel. Expected simple behaviour: TGit just merge main repo without submodules. Expected extended behaviour: TGit gives me a choose a submodules to merge or only if my submodule head on feature/.., shows me error (or choice) ("Your submodule stand on feature branch, pls merge it").

sboulema commented 8 years ago

It looks like it is not handling spaces in branch names correctly

sboulema commented 8 years ago

How did you create the branch?

Please try this: switch to the branch and then execute 'git symbolic-ref -q --short HEAD', what is the output?

GreenKn1ght commented 8 years ago

$ git symbolic-ref -q --short HEAD
feature/WMS-712

It's correct name. I do not remember exactly how I created the branch, but it was either TGit or SourceTree with GitFlow.

sboulema commented 8 years ago

Found it, will be fixed in the next version

GreenKn1ght commented 8 years ago

Thank you!

sboulema / TGit

Trying to finish feature #18