Search Results

Search found 8 results on 1 pages for 'gitflow'.

Page 1/1 | 1 

• Advice Needed: Developers blocked by waiting on code to merge from another branch using GitFlow

  - by fogwolf

  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 Jira subtasks of Jira features). We are using Stash to assign a reviewer when we create a pull request to merge back into the parent branch (usually…

  Read the article

• How should I incorporate a hotfix back into a feature branch using gitflow?

  - by Mark Trapp

  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 branches, but nothing is said or done about extant feature branches. Nevertheless, I'd like to incorporate the hotfix changes back into my…

  Read the article

• What is the correct way to deal with similar but independent features?

  - by Koviko

  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 branches from the release branch and begins work on the feature. Soon after, we get another feature request, which we'll call feature-2. It…

  Read the article

• Finish feature reverted commits from develop

  - by marco-fiset

  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 feature. The main development continued on the develop branch, and changes from develop were merged periodically into the feature, to…

  Read the article

• What are some cool git or .gitignore tricks & best practices? [closed]

  - by 01walid

  Git is just awesome and fast VCS, however, knowing better this tool will help you incredibly increase your productivity and save your time. Here we can try to make a collection of tips, tricks and useful links to better take advantage of git, this question can have some more sub-questions, I mean: what are some usefull commands…

  Read the article

• Git doesn't sync files until committed, even if checked out in a different branch

  - by DertWaiter

  Okay, I have git 1.7.11.1 on Windows and I have a local test repository with 2 branches. One is master with index.php and help.php. I then create another branch called slave :) I run from git bash rm help.php and it disappears from the folder, but I don't stage anything. I switch to checkout master branch and it is supposed to…

  Read the article

• Git dont sync files untill committed even if checkout different branch

  - by DertWaiter

  Ok i have git 1.7.11.1 on windows and i have local test reposotory with 2 branches one is master with index.php help.php then i create another branch called slave :) I run from git bash rm help.php and it dissapears from the folder, but i dont stage anything. I switch to checkout master branch and it supposed to restore file…

  Read the article

• How Mature is Your Database Change Management Process?

  - by Ben Rees

  .dbd-banner p{ font-size:0.75em; padding:0 0 10px; margin:0 } .dbd-banner p span{ color:#675C6D; } .dbd-banner p:last-child{ padding:0; } @media ALL and (max-width:640px){ .dbd-banner{ background:#f0f0f0; padding:5px; color:#333; margin-top: 5px; } } -- Database Delivery Patterns &…

  Read the article

1