`git describe` on develop branch doesn't work #126

Closed
sirlancelot opened this Issue May 12, 2011 · 1 comment

Projects

None yet

2 participants

@sirlancelot

Since release tags only happen on the master branch, running git describe on the develop branch yields:

fatal: No tags can describe 'afc0a77f45f380b077cedabcd16adeb8c5bbc401'.
Try --always, or create some tags.

To fix this, Instead of running git merge release/xxx on the develop branch, I run git merge master after the release branch has been merged in to master and deleted.

This allows me to run git describe on my develop branch and get:

v5-1-gc6acce1

Which is more useful during development if I want to package development releases for testing.

So the order is:

  • create release branch
  • bump version, etc.
  • merge release/xxx branch to master
  • merge master branch to develop
@gvangool
gvangool commented Jun 8, 2011

As you've stated yourself, this would be resolved by using #85.

@richardbuckle richardbuckle added a commit to richardbuckle/gitflow that referenced this issue Oct 21, 2011
@richardbuckle richardbuckle Add short flag for backmerge and default to true
Add short flag `b` for `backmerge`.
Default `backmerge` flag to true (conforms to new branching model).
Fixes #49, #126
d8fbec4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment