Search Results

Search found 988 results on 40 pages for 'branching and merging'.

Page 1/40 | 1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >

• Branching strategy for frequent releases

  - by Technext

  We have very frequent releases and we use Git for version control. When i am mentioning about frequency, please assume it to include bug-fixes and feature release too. All releases are eventually merged into ‘mainline’. When a release is deployed on production and if a bug is identified, people start fixing the bug on the same branch from which the…

  Read the article

• Guidance: A Branching strategy for Scrum Teams

  - by Martin Hinshelwood

  Having a good branching strategy will save your bacon, or at least your code. Be careful when deviating from your branching strategy because if you do, you may be worse off than when you started! This is one possible branching strategy for Scrum teams and I will not be going in depth with Scrum but you can find out more about Scrum by reading the…

  Read the article

• Understanding branching strategy/workflow correctly

  - by burnersk

  I'm using svn without branches (trunk-only) for a very long time at my workplace. I had discovered most or all of the issues related to projects which do not have any branching strategy. Unlikely this is not going to change at my workplace but for my private projects. For my private projects which most includes coworkers and working together at…

  Read the article

• Git commit messages with nvie branching model

  - by eykanal

  This Git branching model recommends branching for all development efforts and merging when complete: Branch Develop Merge when complete I'm wondering how this works in practice, given that performing a merge off this model will simply add a commit to the develop with whatever commit message happened to be the last one in line. Do people…

  Read the article

• Branching and CI Builds with Agile

  - by Bob Horn

  We follow many agile processes, including automated tests, continuous integration, sprint reviews, etc... We're currently having a debate about how often we should branch release builds. We've been doing two-week sprints and trying to deploy to production at the end of each sprint. Some of us think we should be branching every sprint. Some…

  Read the article

• SVN Workflow - Chicken Before the Egg - Before merging V1 with V2, I need code from V1 to work on V2

  - by Jake

  Hi, Our distributed team (3 internal devs and 3+ external devs) use SVN to manage our codebase for a web site. We have a branch for each minor version (4.1.0, 4.1.1, 4.1.2, etc...). We have a trunk which we merge each version into when we do a release and publish to our site. An example of the problem we are having is thus: A new…

  Read the article

• Git branching and tagging best practices

  - by Code-Guru

  I am currently learning to use Git by reading Pro Git. Right now I'm learning about branching and tags. My question is when should I use a branch and when should I use a tag? For example, say I create a branch for version 1.1 of a project. When I finish and release this version, should I leave the branch to mark the release version?…

  Read the article

• Git bug branching convention

  - by kisplit

  I've been following the successful Git branching model guide for most of my development. I still wonder if the way I handle bug tickets is correct. My current workflow: Once I accept a bug ticket I will do a git checkout -b bug/{ticket_number}, create a single commit as a fix and then checkout develop and do a git merge --no-ff. …

  Read the article

• Git branching / rebasing good practices

  - by Pawel Krupinski

  I have a following scenario: 3 branches: - Master - MyBranch branched off Master for the purpose of developing a new feature of the system - MyBranchLocal branched off MyBranch as my local copy of the branch MyBranch is being rebased against and pushed to by other developers (who are working on the same feature as I am). As…

  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,…

  Read the article

• Develop in trunk and then branch off, or in release branch and then merge back?

  - by Torben Gundtofte-Bruun

  Say that we've decided on following a "release-based" branching strategy, so we'll have a branch for each release, and we can add maintenance updates as sub-branches from those. Does it matter whether we: develop and stabilize a new release in the trunk and then "save" that state in a new release branch; or first create that…

  Read the article

• Best branching strategy when doing continuous integration?

  - by KingNestor

  What is the best branching strategy to use when you want to do continuous integration? Release Branching - Unstable Trunk: or Feature Branching - Stable Trunk: Does it make sense to use both of these strategies together? As in, you branch for each release but you also branch for large features? Does one of these…

  Read the article

• Transitioning to Branching with TFS

  - by Rob

  Our team is currently using plain old TFS 2005, no branching, shared checkouts etc... I would like to introduce a DEV/MAIN/PROD branching system simillar to the basic flavor in the TFS Guidance document so that we can do some parallel dev, isolation, and firm up review and deployment processes. I have read most of the…

  Read the article

• What Happens to Commit Logs on a Branch After Merging?

  - by Levi Hackwith

  Scenario: Programmer creates a branch for project 'foo' called 'my_foo' at revision 5 Programmer makes multiple changes to multiple files as he works on the 'my_foo' feature. At the end of each major step, say adding several new functions to class, the programmer does an svn commit on the appropriate files therefore…

  Read the article

• What guidelines should be followed when using an unstable/testing/stable branching scheme?

  - by Elliot

  My team is currently using feature branches while doing development. For each user story in our sprint, we create a branch and work it in isolation. Hence, according to Martin Fowler, we practice Continuous Building, not Continuous Integration. I am interested in promoting an unstable/testing/stable scheme, similar…

  Read the article

• How do you handle the tension between refactoring and the need for merging?

  - by Xavier Nodet

  Hi, Our policy when delivering a new version is to create a branch in our VCS and handle it to our QA team. When the latter gives the green light, we tag and release our product. The branch is kept to receive (only) bug fixes so that we can create technical releases. Those bug fixes are subsequently merged on the…

  Read the article

• What's the best way to explain branching (of source code) to a client?

  - by Jon Hopkins

  The situation is that a client requested a number of changes about 9 months ago which they then put on hold with them half done. They've now requested more changes without having made up their mind to proceed with the first set of changes. The two sets of changes will require alterations to the same code modules. …

  Read the article

• Tools for Maintaining Branches in SVN

  - by Chris Conway

  My team uses SVN for source control. Recently, I've been working on a branch with occasional merges from the trunk and it's been a fairly annoying experience (cf. Joel Spolsky's "Subversion Story #1"), so I've been looking alternative ways to manage branches and merging. Given that a centralized SVN repository is…

  Read the article

• SVN Question regarding branching and third party vendor branching

  - by fritzone

  Hi, We are developing an application which consists of: a source code base given to us by a partner infrequently. This is a somewhat working code, "final" version of something. They have their own release cycle and version tracking. on the code base above we make our changes. These can be either bugfixes or…

  Read the article

• Moving from SVN to HG : branching and backup

  - by rorycl

  My company runs svn right now and we are very familiar with it. However, because we do a lot of concurrent development, merging can become very complicated.. We've been playing with hg and we really like the ability to make fast and effective clones on a per-feature basis. We've got two main issues we'd like…

  Read the article

• Branching and Merging Strategies

  - by benPearce

  I have been tasked with coming up with a strategy for branching, merging and releasing over the next 6 months. The complication comes from the fact the we will be running multiple projects all with different code changes and different release dates but approximately the same development start dates. At…

  Read the article

• git-svn branching

  - by slayerIQ

  Hello, I am using git with an svn repository everything is going fine I did all my branching with git so I did not branch on svn but I branched with git and pushed those branches to a separate location. Then I commited changed from the branch when needed. But now I want to create some branches that…

  Read the article

• Merging results of two stored procedures

  - by Diogo Lopes

  Good afternoon. I liked to ask for aid .. I have a SQL query too long to process. So I remembered to share in some stored procedures. Now my doubt is as follows: ***Is there a way to attach the result of several stored procedures?*** Already a thank

  Read the article

• Is there an established or defined best practice for source control branching between development and production builds?

  - by Matthew Patrick Cashatt

  Thanks for looking. I struggled in how to phrase my question, so let me give an example in hopes of making more clear what I am after: I currently work on a dev team responsible for maintaining and adding features to a web application. We have a development server and we use source control…

  Read the article

• Merging branches in tortoiseHg does not seem to work

  - by Spock

  In a project, I have a default branch and another named branch. After a merging both branches and committing it, the graph in TortoiseHg shows that both branches have been merged. However, pushing to a remote repository (which is at the stage before branching, it only has the default branch), I…

  Read the article

1 2 3 4 5 6 7 8 9 10 11 12  | Next Page >