git-flow

问题 I have a release branch named release/X.X.X.X which contains all feature branches I want to deploy to production. The release branch is made on top of master which is the current state of production. On every release day I make sure our release branch contains only those changes planned for the release. I use this command to compare the release and master branch: git log release/X.X.X.X ^master --no-merges . I then manually check the commits for keywords like "SHR-1234" which represent ticket

问题 I have been using git flow for a couple of months and it has worked very well. I would like to automate the "bump version" operation. The project is PHP and the footer.php has a token to replace with the current release tag. I am certain that with some awk'ing of git log and the PHP file everything should work out, but I assume someone has done this before... Any ideas? 回答1: You could use the semver gem, which adds a file .semver to the root of your git repo. Semantic version numbers are a

问题 I am using git-flow and many topic-branches, AKA feature branches. I was working on a feature branch, when it was decided to take an entirely different route. I now want to remove that branch, as the work in there will not be merged into development or master and it only "clutters" the list of branches. But I'd like to keep the history in that branch for historical and administrative purposes (and the odd chance that we all change our mind again and the archived work has to be dug out). What

问题 My team has been used SVN for a long time, and we are going to move our source repo to Git soon. In my team, there at at least 10+ dedicated developers for the system and more developers who frequently touch systems codebase. Since our system has many features like account management, payment, 3rd party connection, etc, almost every systems in the company has dependency on it, and we should always deliver early feature implementation in dev(or QA) to allow others develop their feature. With

问题 I am trying to introduce Git flow to my team. We are a fairly small team and quite agile. We want to release once a day and this means we have limited time towards testing all the changes in the day. Business team wants to be able to control the features that are getting released although its not ideal. Git flow doesn't seem to accommodate this very well. After cutting a release branch from develop what is the best way to merge selected features to master. Is cherry picking the only option?

问题 Is there a way to merge several commits by different authors with Git. So that a commit is used per feature that still allows others to see who wrote the each line of code. Will using a tool like git-flow help facilitate this ? ie; branch NewFeature10 feature UI feature Backend feature Admin feature AdminBackend squash and merge these commits to master so master follows branch master NewFeature10 NewFeature9 NewFeature8 ... 回答1: A commit has 1 and only 1 author. The best you could achieve

问题 Currently, I'm able to install git-flow using apt-get install git-flow But, it's always installing version 1.6.0 AVH Edition. Please help me install 1.9.0 AVH Edition. 回答1: I created a new PPA on Launchpad for git-flow AVH. http://launchpad.net/~pdoes/+archive/ubuntu/gitflow-avh It has the latest gitflow version for Ubuntu Precise, Trusty, Wily, and Xenial. I used the original Xenial package for backporting. 来源： https://stackoverflow.com/questions/36442801/how-to-install-git-flow-1-9-1-avh-in

问题 I'm using Git Flow for my project, and have completed the git flow feature finish step that merged my feature branch into my develop branch. I then performed git push to GitHub, but on GitHub I still see the feature branch as well as develop . When I run git branch locally, I only see develop and master , which is what I'd expect. How can I remove the branch from GitHub? I could cope with this one, but if this happens for every feature I'll end up with a massive list of old branches. Many

问题 Consider this excerpt of git log --oneline --decorate --graph : * 552485a (HEAD -> master, origin/master) Finish v0.8.4 |\ | * c198066 (tag: v0.8.4) some commit message * | 343af72 Finish v0.8.3 |\ \ | |/ | * 0267e30 (tag: v0.8.3) some commit message * | 8f0ff57 some commit message |\ \ | |/ ... (NB: the tag v0.8.4 is on a commit from branch 'develop') How comes that when I run git describe I get this: v0.8.4-16-g552485a that is, git counts 16 commits since tag v0.8.4. I'd expect it to return

问题 I've been reading and re-reading the post about a successful git model (git flow) and I'm confused about a couple things when working off a develop branch. He says: When starting work on a new feature, branch off from the develop branch. $ git checkout -b myfeature develop What branch is he starting in? My checked out 'develop' branch? Is the 'develop' after 'myfeature' track my local 'develop' branch or the remote 'origin/develop' branch? If I start in my 'develop' branch when I create