search

Twenga / twgit

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.
http://twgit.twenga.com/
Other
111 stars 34 forks source link

Allow to merge last tag on features #124

Open geoffroy-aubry opened 10 years ago

geoffroy-aubry commented 10 years ago

Thanks to Olivier for the idea :-)

oversanne commented 10 years ago

Thanks :)

But it is not exactly that.

When I finish a release, a new tag is created and is not merged in all feature branch.

I would like to have a command to merge last tag in all feature.

Sebastien-Hanicotte commented 10 years ago

This could be useful for branches with not too much movement, but it could too often generate merge conflicts and/or sometimes bad automerge result.

Good luck with such feature. It may need documentation and possibility given to choose between old or recently opened features. Le 6 avr. 2014 16:22, "oversanne" notifications@github.com a écrit :

Thanks :)

But it is not exactly that.

When I finish a release, a new tag is created and is not merged in all feature branch.

I would like to have a command to merge last tag in all feature.

Reply to this email directly or view it on GitHubhttps://github.com/Twenga/twgit/issues/124#issuecomment-39669606 .

ltoussaint commented 9 years ago

I don't think it's good to do it in all features. But we can give a command twgit feature merge-last-tag.

Examples : twgit feature merge-last-tag => merge last tag into current feature (if we are on a feature) twgit feature merge-last-tag 123 789 => merge last tag into feature-123 and feature-789

Also, we could create a command twgit release merge-last-tag (without any argument)