Details
-
Suggestion
-
Resolution: Unresolved
-
None
-
OS X Yosemite (10.10.2)
Description
Requirements: Empty repository with a remote on machine M1 with git-flow initialised (`develop` branch is required).
Steps to reproduce:
- M1: create a feature branch;
- M1: check out the feature branch;
- M1: make few commits in the feature branch (N > 1);
- M1: push the feature branch to remote;
- M2: pull the changes and checkout the develop branch;
- M2: merge the feature branch into develop;
- M2: push the merge commit to origin;
- M1: fetch (not pull) the changes from origin;
Now observe, that develop branch on M1 is N commits behind the remote one when it actually should be only 1 commit behind (the 1 commit that is merge between feature and develop branches). The SourceTree counts the commits using the last, not the first parent of the merge commit. To fix this you can use `--first-parent` flag that appeared in git 1.8.4.
Please ignore this improvement request if that's intended behavior.