Open KES777 opened 9 years ago
The main idea of git flow to make use of powerfull git branching. http://nvie.com/posts/a-successful-git-branching-model/ When there are Fast-forward behaviour we lose inforation about branching.
prevent losing that info. make --no-fast-forward by default
[feature/#31_add_missing_button 27bf5f6] Missing button is added 1 file changed, 2 insertions(+), 1 deletion(-) feelsafe@dev:/w/www/localities$ git flow feature finish Branches 'develop' and 'origin/develop' have diverged. And local branch 'develop' is ahead of 'origin/develop'. Switched to branch 'develop' Updating ed0b921..27bf5f6 Fast-forward www/localities/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Deleted branch feature/#31_add_missing_button (was 27bf5f6).
Summary of actions:
The main idea of git flow to make use of powerfull git branching. http://nvie.com/posts/a-successful-git-branching-model/ When there are Fast-forward behaviour we lose inforation about branching.
prevent losing that info. make --no-fast-forward by default
[feature/#31_add_missing_button 27bf5f6] Missing button is added 1 file changed, 2 insertions(+), 1 deletion(-) feelsafe@dev:/w/www/localities$ git flow feature finish Branches 'develop' and 'origin/develop' have diverged. And local branch 'develop' is ahead of 'origin/develop'. Switched to branch 'develop' Updating ed0b921..27bf5f6 Fast-forward www/localities/index.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) Deleted branch feature/#31_add_missing_button (was 27bf5f6).
Summary of actions: