Twgit is a free and open source assisting tools for managing features, hotfixes and releases on Git repositories. It provides simple, high-level commands to adopt the branching model describes in our documentation. Supported OS: Debian/Ubuntu Linux, Mac OS X 10.8 (Mountain Lion) or lower.
Need feature-2 to start from feature-1 and use rebase to do it
Commit on feature-2 and push it (this need a pull before the push)
Run twgit release list
In this case, we can see a warning on feature-2
Release: origin/release-1.1.0 (from v1.0.0)
commit 98f92985220d06ce165d2a5689ecd42bd42d00fb
Author: Laurent Toussaint <laurent.toussaint@twenga.com>
Date: Mon Jan 11 17:31:08 2016 +0100
Features:
- origin/feature-1 [merged]
- origin/feature-2 /!\ merged, then in progress.
But this feature is not merged into the release as we can see using git log on the release
The problem comes from the git pull creating a merge between the local feature and the distant one.
Ideally we should use the command git pull --rebase=true to prevent this error, but even using a simple git pull, we should not have this issue.
The is a bug when using rebase on a feature.
Use case
In this case, we can see a warning on feature-2
But this feature is not merged into the release as we can see using
git log
on the releaseThe problem comes from the
git pull
creating a merge between the local feature and the distant one. Ideally we should use the commandgit pull --rebase=true
to prevent this error, but even using a simple git pull, we should not have this issue.How to reproduce the issue bug
And run
How to fix it
Look at thiese functions