git-flow is a popular workflow that extends the verbs available to git and helps handle moving changes between feature, development, release, hotfix, support, and production branches.
6
votes
0answers
91 views
Keeping a clean git history when using gitflow - unmerged commits on develop
Using gitflow, when creating a release-1.0.0 branch and merging it to both master and develop, both branches will have a missing commit:
master wont have the commit where release-1.0.0 was merge to ...
0
votes
1answer
32 views
how to handle small change requests in the automated deployment process
I've setup a Gitlab server to manage several different Laravel Apps. I'm also able to configure the Gitlab CI to deploy the code to the development and production sites. Everything is kind of ...
6
votes
3answers
144 views
What is the “definition” of a finished feature in Gitflow?
This is a Gitflow process question. In all the documentation (and diagrams) I've read about Gitflow, they always indicate that once a feature is completed it is merged back into the develop branch.
...
1
vote
2answers
65 views
Git workflow that allow new hire to work on feature without polluting git history
We want a new hire to work on some features of our current project, however, since he is a new hire, we would like to do code review before he can commit into master branch. Also, we don't want his ...
0
votes
2answers
44 views
Hotfixing with an open release branch while this release is currently tested
We are using gitflow and currently have an open release branch.
The release at A is currently on the test-system to get tested by key-users. In the meantime we need to release an urgent hotfix. ...
0
votes
0answers
22 views
Should a test system release really be a common release in GitFlow?
We are actually releasing a version to the test system as a common release in GitFlow. We create a release branch, clean things up and merge it into master and development.
The thing is that if I ...
0
votes
1answer
103 views
Simpler git-flow model, am I doing it right?
I'm trying to implement a branching model that is similar to git-flow, but simpler (no release or hotfix branches).
The idea is to have the master branch always up to date with the latest tagged ...
1
vote
1answer
56 views
What is the purpose of keeping “open” a merged MR in Gitlab?
In gitlab, there is Merge Requests (MR) like in github there is Pull Requests (PR).
If the MR is rejected, sure, we close it.
But what if the MR is merged ? In that case the button to close the MR ...
18
votes
3answers
918 views
Should I use git stash to save ongoing changes of my project and push it to github to access in other computers?
I very often work on some features of my project that I need to take a break before it is good enough for a commit. However, I use daily two different computers to code (my laptop and my research lab ...
2
votes
2answers
118 views
How do I manage a major overhaul of an open-source project with git?
I have a somewhat popular open-source project on Github, and I'm getting ready to do a major overhaul - completely different directory structure, substantially different versions of major components, ...
0
votes
1answer
78 views
GitFlow, should my release branch include minor version number?
I've found it difficult to find a definitive answer to this question. Using Semantic Versioning and GitFlow should my release branch include the minor version number? I'm not referring to tags.
My ...
5
votes
4answers
734 views
In GitHub flow, is it OK to base feature branch on another feature branch?
We use GitHub Flow in our project and most of the time, we open a new feature branch from master, do some work there, open a PR, review the code and merge back into master.
However, my current work ...
1
vote
1answer
138 views
More than one deployable git branch
My dilemma is about the GIT flow.
Let's assume that I have an application that can be deployed differently (staging release, QA release, production release).
Since the application has profiles to be ...
3
votes
1answer
66 views
Isn't the master branch just a surrogate of tagging in the gitflow model?
Reading the gitflow model, it seems to me that the master branch is there only to provide a branch where to store stable versions. What does that add to just tagging develop with the stable versions?
4
votes
1answer
80 views
Do feature fixes need to be local only?
From this blog post describing the git-flow model, it seems that feature branches have to remain local to the user working on them and are actually deleted right before pushing to origin.
This kind ...
1
vote
0answers
298 views
Where do bugfixes go in the git-flow model?
In the, commonly referred to as, Git-flow model hotfixes go in their specific hotfix-* branch and small integration fixes right before release go in the release-* branch. General bugfixes from the ...
4
votes
2answers
252 views
Fork Management of Git Multi-level Hierarchies
We have the following Git hierarchy structure in place, where each child is forked from the parent. If we build something in Client1 that will be useful in the entire hierarchy, what is the best way ...
23
votes
6answers
915 views
How do I approach a complicated merge
Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
2
votes
2answers
91 views
Bugs showing up with merge on the release branch
When trying to follow the the gitflow model, we have a branch for the releases. However, we've had complicated merges when trying to merge from develop and bugs have crept in to that branch from this....
5
votes
2answers
362 views
gitflow model with UAT releases is too chaotic, how to simplify?
At $DAYJOB, we have the following release/delivery pipeline:
Get new features, work on new features.
Once all features are completed, our own QA performs regressions, etc.
QA signs off on first UAT ...
43
votes
3answers
4k views
What happens if a feature merged into develop is postponed by management?
We recently had a problem whereby a feature for our webapp (automatic signup) was postponed by management because they felt the start was too "cold" but they wanted all the other features we had been ...
3
votes
1answer
154 views
Merging from unfinished feature branches and code review
We are using the git flow workflow, and it sometimes happens that we have long-lived feature branches. Of course we can merge from the develop branch into our feature branch, when another feature ...
6
votes
1answer
239 views
Introducing Pull Requests for a 2 person team - merge my own requests?
I'm introducing git to a junior team member (a co-op).
They are comfortable now with the basics of adding, committing, pushing and pulling.
Now I want to introduce them to pull requests and branches....
0
votes
1answer
64 views
Average commits per merge to Master using gitflow [closed]
I'm currently working alone on a project, but I still use Git since it is a really powerful tool. I use gitflow workflow methodology, and today I have merged to master with 77 commits. I was surprised ...
4
votes
1answer
223 views
Does Changing Author info in git repo affect other contributors?
After contributing some weeks I noticed that the author name in my commits were incorrect. Does changing the git history with author info in the commits create any problems for my fellow contributors?
2
votes
1answer
679 views
Git branch model critique: always derive from master
I am currently working on a large project involving at least 3 teams working on separate feature sets in the same codebase versioned on Git. Some features require back-end integration and ...
3
votes
2answers
612 views
Git(flow) workflow for web development
In my (small) company, we are currently thinking about dumping our current versioning system (svn) and release procedures, which are crap TBH, and switching to git. It will mainly be used for one ...
6
votes
1answer
393 views
Avoiding the Grid of Doom™ in Git-Flow
My project follows the Git Flow branching model. Development happens on develop, which is merged into master and tagged there for releases. Hotfixes happen in branches branched off the current master. ...
1
vote
1answer
298 views
Why do I have to run git add after making changes?
I started using git when I was studying for small projects and then the workflow was git add file when having made a new file and then git commit -m ... for subsequent changes.
Now I'm in a new ...
-1
votes
1answer
838 views
A good workflow to start with Continuous Delivery?
My team is facing a couple of new challanges in the near future, as we will start developing a couple of (micro)services which will run in a cloud environment. Therefore we want to establish a ...
2
votes
1answer
340 views
forking boilerplates? or simply cloning them?
Using gitlab/github.
I created boilerplates for all my projects so I've:
wordpress-boilerplate
html5-boilerplate
laravel-boilerplate
ror-boilerplate
I'm debating myself if/when starting a new ...
1
vote
0answers
534 views
GitFlow with TFS 2013, bumping versions
We have TFS 2013 only for version control, Team City for building, a Nuget server and Visual Studio 2013. Little late in the game but we haven't set guidelines for getting code from development into ...
4
votes
3answers
136 views
What is the correct way to deal with similar but independent features?
Let's say we have a feature request come in and we begin work on it, which we'll call feature-1. It introduces some new logic to the application, which we'll call logic-A and logic-B. A programmer ...
11
votes
1answer
9k views
GIT workflow for web development
Long ago the small team of web developer I work with started using git for web development. Back then we just committed to staging or master directly and then merged frequently between the two. It was ...
2
votes
1answer
93 views
Does it make sense to use tag without version numbers?
In our working group we had a discussion on using git tags in our projects. Some people argumented pro tags and some argumented against using tags.
The crux is that we are talking about Magento ...
10
votes
4answers
2k views
Developers blocked by waiting on code to merge from another branch using GitFlow
Our team just made the switch from FogBugz & Kiln/Mercurial to Jira & Stash/Git. We are using the Git Flow model for branching, adding subtask branches off of feature branches (relating to ...
4
votes
1answer
104 views
Merging around 15 small Git repos of non-optional centralized web service components to a single large repo
In a centralized web service we break down the components into various small Git repos by software modules, e.g. authentication module, authorization module, data access module etc. (around 15 repos ...
0
votes
1answer
1k views
In Git, is the use of a 'PRODUCTION' branch necessary and/or would it be feasible to have more than one of them?
A short summary of how we do branch managing: From the MASTER branch one or many feature branches can be made (for mid to long term development), when deploy-able changes have been merged to MASTER ...
3
votes
1answer
240 views
Trying to understand what Travis CI does and when it should be used
I am very new to Git and I am planning to contribute to some open-source project on GitHub after discovering a small error in it. Upon forking it and fixing the error, I purposed a pull request and I ...
5
votes
1answer
8k views
In git, is it a bad idea to create a tag with the same name as a deleted branch?
I have a project with a git branching model that roughly follows that of nvie's git-flow.
Our release branches are named in a SemVer format, e.g. v1.5.2
Once a release branch is given the green ...
8
votes
1answer
2k views
Obstacles to using Git Flow in Subversion
My team at work is starting a new project, using Subversion as our VCS (you may consider this set in stone for the purpose of this question). We're still in the early stages of the project and are ...
2
votes
2answers
312 views
Finish feature reverted commits from develop
I am using git as a version control system, and using git-flow as the branching model. I started a feature branch some weeks ago in order to maintain the system in a clean state while developping that ...
4
votes
1answer
13k views
SourceTree app, how do I know what is my current branch?
I have branched from my develop branch bugfix/issue2 to work on a bugfix. Now that it's done I want to merge this branch bugfix/issue2 back onto develop but it's asking me if I want to merge into my ...
19
votes
6answers
920 views
Development methodologies when hundred of developers are working on one single solution?
We are an organisation consisting of around 200 developers that are working continuously on one single product (using the revision control Git) which is planned to be released at a certain date.
Due ...
5
votes
1answer
727 views
Is git-flow in the spirit of git? [closed]
The question is pretty self-explanatory. I've had some experience with git-flow, and not much more true experience with plain git before that. (I was using it more as a backup-provider.) I'm ...
24
votes
4answers
9k views
code review with git-flow and github
With regular git and github I can do a code review by simply creating a pull request of the feature branch I'm working on to the master branch. How would I do code reviews with git-flow? With workflow ...
27
votes
2answers
8k views
Is a merging strategy like Git Flow really an anti-pattern?
My company is using Git, and is using a peculiar branching scheme - work is done in master, and branches are reserved for releases. This works fine, so long as all of the work done in an iteration ...
3
votes
1answer
723 views
Where does the git flow release message go? [closed]
When creating a release with git flow like:
git flow release finish <branch_name>
I'm prompted for a release message. I grepped around to see where this go, but no succes. Any idea?
6
votes
1answer
2k views
How should I incorporate a hotfix back into a feature branch using gitflow?
I've started using gitflow for a project, and I have an outstanding feature branch as well as a newly created hotfix. Per the gitflow workflow, the hotfix gets applied to both the master and develop ...
6
votes
1answer
533 views
Which commit to add issue/bug tracking ticket # to
I have been committing changes in git for a project over the last several months. I would like to start integrating Trac into my workflow. Generally, I have the 'git flow' style of git repository. I ...
