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.
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.
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 then release branches are made. Release branches are kept for maintaining deployed version until the next release occurs and they are merged to PRODUCTION in order to build TAGS which are deployed to Live Environments.
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 better than nothing, but it was also a mess.
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 a build and package management process. Git-Flow as shown below will work for most of our projects (i.e. we need only one development line). We aren’t forced into TFS but I would like to see if GitFlow can work even with TFS (note: not much prior experience with TFS instead Git). With TFS 2013+ merging a branch like release below should be possible into master? There was a restriction (I think) with pre-2013 TFS that branch merging was only possible back to it’s origin (i.e. development in the release case).
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 a build and package management process. Git-Flow as shown below will work for most of our projects (i.e. we need only one development line). We aren’t forced into TFS but I would like to see if GitFlow can work even with TFS (note: not much prior experience with TFS instead Git). With TFS 2013+ merging a branch like release below should be possible into master? There was a restriction (I think) with pre-2013 TFS that branch merging was only possible back to it’s origin (i.e. development in the release case).
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 a build and package management process. Git-Flow as shown below will work for most of our projects (i.e. we need only one development line). We aren’t forced into TFS but I would like to see if GitFlow can work even with TFS (note: not much prior experience with TFS instead Git). With TFS 2013+ merging a branch like release below should be possible into master? There was a restriction (I think) with pre-2013 TFS that branch merging was only possible back to it’s origin (i.e. development in the release case).
forking boilerplates? or simply cloning them?
Using gitlab/github.
forking boilerplates? or simply cloning them?
Using gitlab/github.
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.