| commit | 942688d80b40440e9835110982be2c4fbacecff7 | |
| author | Max Hohenegger <eclipse@hohenegger.eu> | |
| Wed, 4 Apr 2018 06:30:43 +0000 (4 08:30 +0200) | ||
| committer | Matthias Sohn <matthias.sohn@sap.com> | |
| Mon, 3 Sep 2018 23:02:49 +0000 (4 01:02 +0200) | ||
| tree | 67937f1f2744cf218467f2453c8367cac12f8227 | treesnapshot (tar.gz zip) |
| parent | 3103dcd44d43bbb655a3be40ce70106c725a7e2e | commitdiff |
Fixed: EGit allows starting features with diverging develop branches
In comparison, when the upstream develop branch is ahead of the local
develop branch command line Gitflow (AVH) raises an error:
$ git flow feature start "foo"
Branches 'develop' and 'origin/develop' have diverged.
Fatal: And branch 'develop' may be fast-forwarded.
Adjusted JUnit tests to cover new code.
Change-Id: I2629301539e96b3911987ad300a7ed538b1d0516
In comparison, when the upstream develop branch is ahead of the local
develop branch command line Gitflow (AVH) raises an error:
$ git flow feature start "foo"
Branches 'develop' and 'origin/develop' have diverged.
Fatal: And branch 'develop' may be fast-forwarded.
Adjusted JUnit tests to cover new code.
Change-Id: I2629301539e96b3911987ad300a7ed538b1d0516