

Merging, meaning that an explicit merge commit is always created In the main menu, go to Repository > Git Flow > Initialise Repository (should be enabled now) Share. To enable non-fast-forward feature in SourceTree, check the below global preference option found from Menubar-> SourceTree -> Preferences -> Git:įor further explanation, I found this excerpt from SourceTree's "Help Center": gitconfig file OR Repository -> Repository Settings -> Remotes -> Edit Config File (Sourcetree 2.7.6) Remove all the gitflow entries and save the file. Refere to the following illustration from Vincent Driessen's article: Non-fast-forward-merge (all commit history made in feature/my-fancy-feature will be gone): git merge -no-ff Recalling the differences between fast-forward merging and non-fast-forward merging:įast-forward-merge (all commit history made in feature/my-fancy-feature will remain): git merge

It will only give you the commit history with the message. git log won't give you the specific branch name (e.g. It depends (the outcome is not git-flow dependent). "feature/my-fancy-feature" branched and merged?" Difference between "fast-forward-merge" and "non-fast-forward-merge" "Once the branch has been deleted, will the graph still be annotated with (2) If you meant to merge the feature/my-fancy-feature: git flow feature finish my-fancy-feature (1) If you wish to discard the feature/my-fancy-feature: git branch -d feature/my-fancy-feature To make sure I fully cover your question, I believe you meant either one of the following cases: It's not only loading repository and commit history very very slow as compared to older version but also not scalling well.
#Sourcetree git flow slow windows 10#
"Finishing" is an ambiguous expression here. SourceTree 2.0 is horribly slow and not scaling well on Windows 10 Saleem Mirza I have just installed SourceTree 2.0.19.1 on my Windows 10 machine and unfortunately, it was a big disapointment. "Upon finishing a feature branch the recommendation is to delete theįeature branch since it is no longer needed for development." Difference between "discarding" and "merging" the feature branch:
