The biggest problem with renaming a branch, is that you will effectively be performing a baseless merge next time you merge to or from the renamed branch. This can cause a lot of pain. I’m currently trying to untangle such a mess at the moment and its not pleasant. (Branch was renamed 4 months ago. … Read more
I would say that staging should be based on a git flow release branch. After a git flow release start and git flow release publish you can start QA work on that branch, including deploying it to a staging area. When the QA work in the staging area has proven the code ready for production … Read more
.rej files are rejected files (usually hunks patches but not only). When ever you get those files after merge you will manually have to edit them, fix them and then apply them back. You can read here some more about it and what is it .rej file diff a.txt (rejected hunks) …. Fix it manually … Read more
You can use the following command to have master point to a new location: git branch -f master branchToMoveMasterTo What this is actually doing is creating a new branch called master that points to branchToMoveMasterTo. Since we already have a branch called master, we need the -f flag to say we want to delete the … Read more
I’ll refer to parts of the first diagram from nvie.com’s Git Flow page throughout my answer; for completion, I’ve added a screenshot of it below. Today, the QA dept would like to take my new feature for a test drive. However, if I create them a build from my branch, none of the bug fixes … Read more
Create your topic branch off of the first branch. As soon as the first is merged into master you can rebase on top of that, and assuming not too much was changed it shouldn’t be a problem. If the commits of the first branch aren’t changed your new branch will stack neatly on top of … Read more
You can simple delete staging and re-create it based on beta: git branch -D staging git checkout beta git branch staging
You can define your path in cmd with the TFPT. And then, from there, you go to the destination folder or workspace where you want to unshelve your code. 1. c:\>path = %path%;C:\Program Files (x86)\Microsoft Team Foundation Server 2010 Power Tools 2. cd c:\[some location]\”destination workspace” 3. tfpt unshelve /migrate “NuGet Build” /source:”$/ProjectName/Main/Source” /target:”$/ProjectName/Main/Target-NuGet” Here … Read more
We use what is called the unstable trunk development method. This was the development methodology that the creators of Subversion had in mind when they created Subversion. It’s simple and easy to implement. You do all of your development on trunk. Thus called the unstable trunk. When you get close to a release, you make … Read more