git-flow | 易学教程

Gitflow and testing / deployment

阅读更多关于 Gitflow and testing / deployment

问题 I have a few questions around how do you handle testing and deployment when many developers are working on the same thing (that cant be split further) and you still want to deploy daily. Currently we follow Gitflow where we have our features branches that everyone is working on an isolated feature. Features are merged into develop branch. Every now and then we take some time to cater for user requirements / bug fixes / quick features etc. The end goal is to get those to PROD asap. My question

git-flow finish release - selective merge

阅读更多关于 git-flow finish release - selective merge

We've recently started using git-flow in our company, and we've came across the following issue: We have a DEV_MODE boolean that controls the level of logging in the app, we want the develop branch to always have DEV_MODE=true . However, when releasing a version we change the DEV_MODE to false . When I do finish-release in git-flow , it'll merge the DEV_MODE=false into the develop branch. I there a hook I can use to prevent this, or maybe a way to tell git how to merge files from release branches to develop? VonC You can avoid the merge issue entirely by versionning a file "template", with a

How to keep branches in sync when using Git Flow

阅读更多关于 How to keep branches in sync when using Git Flow

问题 This is the workflow we currently follow: Finish a feature and merge it into develop branch Create a release branch from develop Run build scripts on release branch Create a pull request to merge the release branch into master Accept the release branch pull request and merge The master branch can then deploy to live server by running deploy command This all works great, except in my Git repo my branches are out of sync master is now behind develop because it doesn't have the merge commits

How can QA test multiple features at once with feature branching in Gitflow workflow?

阅读更多关于 How can QA test multiple features at once with feature branching in Gitflow workflow?

问题 If developers were to work on different branches for different features I understand that they can give a QA build from the feature branch and once it is tested it can be merged with "develop". But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are residing in different branches? 回答1: But if the QA team is fairly large and can test multiple features at once how can they be given a build containing features that are

Revert merge Git-Flow

阅读更多关于 Revert merge Git-Flow

问题 This question was migrated from Software Engineering Stack Exchange because it can be answered on Stack Overflow. Migrated 6 years ago . I'm using SourceTree and Git-Flow pattern. Now I have prepared a release for my beta-testers to test so I created a new release/v1.0.1 branch. But my mind slipped and I decided to finish (merge into develop and master and tag) the release even though I haven't even sent out the release to my testers. So I would like to have the release branch open up again

With Git feature branch workflow, when do you update the master branch?

阅读更多关于 With Git feature branch workflow, when do you update the master branch?

I'm fairly new to git and Jenkins. We want to use Jenkins and follow the feature-branch-workflow concept , which I believe is similar to the GitHub flow . I'm aware that the master branch should always be what's currently deployed in production, but then when should the master branch be updated? It seems like there are two choices: BEFORE deploying to production: A pull request gets approved and the successful merge with master triggers the build, deployment to a staging environment, QA testing, and then someone pushes a button to deploy to production AFTER deploying to production: Something

Git-Flow undo a finished feature branch

阅读更多关于 Git-Flow undo a finished feature branch

问题 What options do you have if you want to "undo" a feature branch? Let's say you add a new feature supercool-feature which you finish (merge into development and delete the feature branch) and then it goes into a release. But then your users really dislike this supercool-feature . How can I undo/rewind/reverse this feature which has been already merged into development and a release? I'm using SourceTree to do my versioning. 回答1: Run this command git revert -m 1 <sha1 of M> Explanation Your

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 repository-per-project structuring paradigm. At the same time, any serious project, in our case Maven

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 two solutions and the database are not in sync. This means that frequently only one ore two of the

Git flow with Bitbucket pull requests

阅读更多关于 Git flow with Bitbucket pull requests

I used git flow feature finish to finish a feature branch. I use the AVH fork of git-flow, which deletes the remote feature branch - but the Bitbucket pull request is still open. How should I close the Bitbucket pull request? And what is a correct way to accept a PR in future while following the git flow workflow? While the AVH version of git-flow deletes the remote feature branch when you do git flow feature finish , strangely, it doesn't push anything. It leaves you on the master branch, so once you've done git push or git push origin master:master , the BitBucket pull request will