git-flow | 易学教程

Git flow: Best practice for dealing with minor releases

阅读更多关于 Git flow: Best practice for dealing with minor releases

问题 Git flow uses a certain branch ( master ) for stable releases. Each release is tagged by a version number. The git flow scheme further uses release branches branched-off from develop to prepare a release. However, apparently those release branches are deleted when the release is finished (after the content has been merged back into both master and develop). Hotfix branches are there to deal with issues in production release and are both branched-off and merged-into master. But apparently

Changes on feature branch after merge to master

阅读更多关于 Changes on feature branch after merge to master

问题 I'm looking for a way to introduce changes into feature branches once they have been merged to master. The goal is to keep the feature branch keep only containing commits that are related to it. It often happens that a feature needs some additional polishing after it has already been pushed to master. The changes that have been done to master during that time aren't in conflict with the feature, meaning that a rebase to actual master is possible when implementing the additional work on the

Managing Multi-Project Branches in Git

阅读更多关于 Managing Multi-Project Branches in Git

问题 Are there tools to achieve the following abstract operations in a Maven project/SCM scenario? Given an application project, create branches for the application and all the snapshot libraries that it uses, transitively; these branches should be manageable as one logical branch (see next) Given the logical branch of an application project, release it (by running Maven release); this means releasing multiple branches, one per library Background (original): As you know, Git recommends using the

Versioning and release management with multiple products with shared code base

阅读更多关于 Versioning and release management with multiple products with shared code base

问题 I am currently trying to figure out, how to do release management with git flow in a scenario where I have one git repository with about 15 projects in two solutions plus scripts for the database. Each solution basically contains one project that will result in an executable and more than 10 projects containing base functionality used by both solutions like DAL, SAP access wrapper etc. Solution one is an application with UI for the users. Solution two is a Windows service. The release of the

git branch workflow policy

阅读更多关于 git branch workflow policy

问题 I am new to git and understand a little bit about Git. My company is currently have 1 program and the program divides into 5 products. each product is handling by different team. Currently my company git have 5 branches such as : dev = this branch is for developer to build program (dev.program.com) test(alpha) = this branch is for tester to test the program (test.program.com) staging(beta) = this branch is for tester test the program (double check of error ) and client test the program. (stg

Git-flow fails with “fatal: no tag message? / Tagging failed. Please run finish again to retry”

阅读更多关于 Git-flow fails with “fatal: no tag message? / Tagging failed. Please run finish again to retry”

问题 I am using git-flow to manage a project. I am getting the following message when issuing git flow release finish foo : fatal: no tag message? Tagging failed. Please run finish again to retry. Here is the sequence of steps to reproduce, with a brand new git repository and a single file: touch test.txt git init git add . git commit -m "Initial commit" git flow init [defaults accepted] git flow release start 1.0 echo "Line 1" >> test.txt git add . git commit -am "Line added" git flow release

Git workflow and Gerrit

阅读更多关于 Git workflow and Gerrit

问题 I am trying to implement a 'git-flow' kind of workflow using Gerrit but I can't seem to figure out the last piece of the puzzle. There are two preconditions to my problem: Gerrit will only perform merging to one branch I do not allow merge commits to be pushed to Gerrit. The merging has to be done by Gerrit after the changes are approved What I want to solve is the following. Consider this git situation: Master 0 \ \ Develop 0-----0-----0-----0 There is a master branch with one commit and a

How should gitflow hotfixes work?

阅读更多关于 How should gitflow hotfixes work?

问题 We use Gitflow for our web builds, and I have a question about how hotfixes are supposed to work. But first I should explain that we don't quite use the normal Gitflow workflow. I understand that usually you would branch your features , they would merge into develop when finished, you would create your release , release gets merged into master and you deploy that, as an actual "versioned release". However, as this is client work, we don't do "releases", instead features are deployed as and

How to share a git feature (or topic) branch with multiple developers

阅读更多关于 How to share a git feature (or topic) branch with multiple developers

问题 I'm following the the workflow described here, as I found many references pointing to this page as a good workflow. As mentioned in the article, "feature" branches are shared between developers, but do not go to the central repository. Let's say a developer "A" starts a new feature branch with git checkout -b newfeature develop . Now let's say that developer "B" needs also to work on this feature. This is my problem. What I did: developer "B" adds developer A's machine as a remote developer

SourceTree and Git Flow repository init

阅读更多关于 SourceTree and Git Flow repository init

sh.exe C:\Users\username\AppData\Local\Atlassian\SourceTree\gitflow_local\gitflow\git-flow init -d flags:WARN -d -- C:\Program Files (x86)\Atlassian\SourceTree\tools\getopt.exe: invalid option -- flags:FATAL unable to parse provided options with getopt. I contacted github account, and want to "Git Flow" and it shows a message like above. There was a similar issue reported at Atlassian : It appears though that the issue was a faulty git flow installation prior to the SourceTree install. I removed all git flow installation data and reinstalled SourceTree (after removing all SourceTree data as