git-flow

问题 I'm trying to setup a library project using DevOps. The branching strategy choosed is git-flow in order to have use git version and follow semver with releases and hotfixes. So i tried was to protect both develop and release branches by activating pull requests. Everything works fine unless a release is going to be closed. Here I see two problems: In git-flow the system try to realign develop from master, but devops doesn't know this is git-flow and just merges release to master. Develop

问题 I've been using Git Flow for a little while now, however in the initial week or so I was creating release branches manually from master and cherry picking the required commits into the release branch rather than creating them from master. For example, if I have commit abcd123 My commit message in the develop branch, I had also cherry picked it into the release branch manually, and at this point I had probably amended or edited the commit message, so the release branch (and now master branch)

问题 In development, we often come across a scenario like this: In a MVC web development, stuff A may mainly develop View, while stuff B may mainly develop Controller, then a feature branch like feature/account maybe shared by A and B to cooperate the development of account. If we manage feature branches like above: Question 1: Is it recommended that sharing feature branches between stuffs between stuffs? There's another way to manage feature branches, like this: stuff A manage a branch named

问题 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

问题 I like to keep my feature branches up to date with develop. Is there anything wrong with frequently doing "git merge --no-ff develop". And then at the end, running "git flow feature finish feature1". These feature branches are shared (which means it is possible that someone else could be working on it, or that I'm developing out of it at my computer at home), mostly because I like knowing that they are backed up somewhere else. If they weren't shared, would consistently rebasing be preferred?

问题 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? 回答1: 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

问题 I've got a repository with my develop branch protected and I'm using the GitFlow branching model. There's two branches; develop (containing features currently being developed) and master (latest deployed production code). My develop branch prevents commits being directly made via GitHub's Protected branches. When you locally finish a hotfix using GitFlow, it automatically merges the hotfix branch into your local master and develop branches. However, pushing changes directly on the develop

问题 I'm working with a repository that in theory should be following the Gitflow Workflow (see A successful git branching model by Vincent Driessen). However, the initial commit on the repository was made on the develop branch and there is no master branch to be seen. It's nearing release time and I need to create a master branch that reflects the production-ready state of the project which should've been there from the start. Keep in mind that the develop branch has multiple feature branches

问题 When I do git flow init it creates a master and develop branches. When I add the remote I do git remote add origin git@github.com:NewB/our-repo.git . Now I have git flow initialized on my local repo and I have the remote repo added. After I do git push -u origin master I have master in my origin but not the develop branch. Is there a git flow publish for the develop branch? All I'm seeing are publish for feature or release branches. Does git-flow want me to just use regular git and do git

问题 As it currently stands, this question is not a good fit for our Q&A format. We expect answers to be supported by facts, references, or expertise, but this question will likely solicit debate, arguments, polling, or extended discussion. If you feel that this question can be improved and possibly reopened, visit the help center for guidance. Closed 7 years ago . Are any large software projects using git-flow and, if so, how is it going? (See http://nvie.com/posts/a-successful-git-branching