git-flow | 易学教程

CI: One git repository fits it all? Or: gitflow for multiple projects

阅读更多关于 CI: One git repository fits it all? Or: gitflow for multiple projects

问题 Until now my team and I do and did not have anything like an automated delivery process in production. Which may sound surprising to some folks, but it simply did not seem to be essential to our daily work. At least we thought so. I am very sure it is something like a car navigation system or an automatic dishwasher - stuff you would die for if you just started using it. However, as we are planning to launch a not so small project in the next couple of weeks, I want to take care that we are

Multiple development branches with git-flow

阅读更多关于 Multiple development branches with git-flow

问题 I am currently looking a lot into git-flow, and trying to figure out, how to use it for the projects I am involved on. I have looked at the various git-flow tutorials and I am fairly familiar with git. Hence I do not need any tips on git alone, but directly on the workflow with git-flow. Here is the situation: When I relase a version (let's call it 1.0), this get's branched of develop, which is fine. Let's say now I start working on 2.0, adding new features. And of course I want to merge them

Finishing a feature branch with GIT Flow

阅读更多关于 Finishing a feature branch with GIT Flow

问题 From my understanding one of the advantages of creating feature branches is so that you can easily see where large groups of commits have been merged into the develop branch. Upon finishing a feature branch the recommendation is to delete the feature branch since it is no longer needed for development. Once the branch has been deleted, will the graph still be annotated with "feature/my-fancy-feature" branched and merged? 回答1: "Upon finishing a feature branch the recommendation is to delete

Git merge master into feature branch

阅读更多关于 Git merge master into feature branch

Lets say we have the following situation in git: A created repository: mkdir GitTest2 cd GitTest2 git init Some modifications in the master take place and get committed. echo "On Master" > file git commit -a -m "Initial commit" Feature1 branched off master and some work is done: git branch feature1 git checkout feature1 echo "Feature1" > featureFile git commit -a -m "Commit for feature1" Meanwhile, a bug is discovered in the master-code and a hotfix-branch is established git checkout master git branch hotfix1 git checkout hotfix1 The bug is fixed in the hotfix branch and merged back into the

Create a branch in Git from another branch

阅读更多关于 Create a branch in Git from another branch

I have two branches: master and dev I want to create a "feature branch" from the dev branch. Currently on the branch dev, I do: $ git checkout -b myfeature dev ... (some work) $ git commit -am "blablabla" $ git push origin myfeature But, after visualizing my branches, I got: --**master** ------0-----0-----0-----0-----0 ------------------------**dev**----**myfeature** I mean that the branch seems ff merged, and I don't understand why... What I'm doing wrong? Can you explain me please how you branch off from another branch and push back to the remote repository for the feature branch? All that

Following git-flow how should you handle a hotfix of an earlier release?

阅读更多关于 Following git-flow how should you handle a hotfix of an earlier release?

问题 If you try to follow the git-flow branching model, documented here and with tools here, how should you handle this situation: You have made a 1.0 release and a 2.0 release. Then you need to make a hotfix for 1.0. You create a hotfix branch off the 1.0 tag and implement the fix there. But what then? Normally you would merge to master and put a 1.1 release tag there. But you can't merge 1.1 to a point after 2.0 on master. I guess you could put the release tag on the hotfix branch, but that

Git branching strategy integated with testing/QA process

阅读更多关于 Git branching strategy integated with testing/QA process

问题 Our development team has been using the GitFlow branching strategy and it has been great ! Recently we recruited a couple testers to improve our software quality. The idea is that every feature should be tested/QA by a tester. In the past, developers work on features on separate feature branches and merge them back to the develop branch when done. The developer will test his work himself on that feature branch. Now with testers, we start asking this Question On which branch should the tester

Managing hotfixes when develop branch is very different from master?

阅读更多关于 Managing hotfixes when develop branch is very different from master?

问题 I'm using the "Git Flow" branching model, with a master branch and a develop branch. I'm working on a major new release, so my develop branch is wildly different from my master branch. This creates a problem anytime I need to make a hotfix on the master branch and merge it back into develop. There are almost always conflicts, and it's becoming a real pain. What is the best way to manage this? It would be easier for me to make the small hotfix changes on develop manually and then merge

Create a hotfix branch or a feature branch in gitflow model

阅读更多关于 Create a hotfix branch or a feature branch in gitflow model

问题 I'm using this model in my team: Today my project stats is following: The stable version is running in production using master branch We developed new functionalities that need to be tested before production, so we have a release branch be testing under SIT Environment . This new functionalities just can be merged with master after all tests in SIT Environment. The problem: The Product Owner requested a new field in a Table in Production. So the team suggest two solutions: Create a hotfix

Handle git branching for test and production

阅读更多关于 Handle git branching for test and production

When working with git (flow) and having a stage/test environment where the customer are doing their reviews of the things developed what is the best way of handling features that aren't approved along with features that are? Consider the scenario that several developers working with different features in a sprint or in a continuous workflow. The features need to be reviewed by the customer and for the features to be able to be reviewed in the stage environment they have to be merged into the dev branch and deployed. If, let's say, two features have been developed, considered done by the