branching-and-merging

问题 I am in need of help setting up a TFS branching structure. The current scenario is as follows, our application is a SaaS, and I believe we need multiple "Release" branches simultaneously. Going through the TFS Branching Guide III, I'm fairly certain that we will need the "Advanced" branching model. We start with having a "main" branch, which will house the application as it stands right now (we're coming from Visual Source Safe). From that we will create a "Development" branch, and leave that

问题 We are trying to implement the "Basic Dual Branch Plan" as described by the ALM Rangers in the latest Visual Studio TFS Branching and Merging Guide. From the guidance: The basic branch plan with a MAIN, DEV, and RELEASE branch enables concurrent development for your next release, a stable MAIN branch for testing and a RELEASE branch for any ship blocking bug fixes. Multiple development areas are supported by creating additional development branches from MAIN. These are peers to each other and

问题 Is there an option like --author of git-commit for git-merge? We maintain a staging environment where some changes must be performed. Some limitations make us to use only one linux user to access staging environment. Anyway, we are a small team with cooperative initiative and we tell when doing commits, which one is the author using the --author git-commit option. However, some times we need to merge from other branches which result in a non-ff merge. This implies a commit is performed when

问题 I'm trying to figure out the best workflow for maintaining a local copy of a github-hosted project (moodle) with customizations, while maintaining the ability to keep our copy up-to-date. Tell me if what I'm thinking about doing is completely insane: Fork the project (github.com/moodle/moodle --> github.com/sfu/moodle) Create an upstream remote (git remote add upstream git://github.com/moodle/moodle.git && git fetch upstream) Create a branch for our custom development and keep master pristine

问题 I'm trying to figure out how to merge branches from a separate repo into the current. I have the following: PJT1 - contains branches default and foodog PJT2 - contains branch default from PJT2, I do the following: $ hg fetch -y ../PJT1 -r foodog -m "this is a test" Now, if I look in PJT2, I see the correct files and changes. However, I if I do hg branches , I get the following: [someone@myhome pjt2]$ hg branches foodog 1:c1e14fde816b default 0:7b1adb938f71 (inactive) and hg branch reveals the

问题 So, we have our main dev line, I create a branch, and developer b creates a branch. We both do some work. developer b finishes his work, merges back into the main dev line. I know his changes will affect me, and rather than deal with the conflicts later, I would like to update my branch, with the changes that are now in the main dev line, so I can deal with them in my branch, prior to merging back into main. How do I do that? 回答1: From Visual Studio, open Source Control Explorer: View | Team

问题 I'm working on a project where we're trying to get to grips with using git in the most efficient manner (for us) and have decided to create 2 branches for 2 sub-teams to work on, along side the master branch. Sometimes we will commit into master if it's something generic that should go into both branches and then we want those changes in the both of the other branches. Should that be a merge or a rebase into the 2 other branches? Is this an insane workflow to be going down the route of? If so

问题 My team has been working in a prototype branch off of master. I now want to take that work, slice it up into different "feature branches", and merge them individually into master. I see a couple ways to do this, neither of which I really like: 1 - Create a new branch, Feature_1, off of master . Manually copy the code from the Prototype to Feature_1. This means I have to keep track of what I've copied when I go to make Feature_N and I lose history. 2 - Create a new branch, Feature_1, off of

问题 I have 2 branches, the main one and the one I'm working on a parallel release. A --> B --> C (master) \ -> E --> F (parallel) The parallel branch will always merge from master . Always. And modify upon it. A --> B --> C --> D --> H (master) \ \ *merge* -> E --> F --> G --> J (parallel) This is easy to do if I switch branches. But, if I'm working on parallel , can I do this without switching branches ? The problem with switching is that it takes a long time to go back and forth (specially on

问题 I just encountered a problem when merging a branch into master in git. First, I got the branch name by running git ls-remote . Let's call that branch "branch-name". I then ran git merge branch-name command and got the following result: fatal: branch-name - not something we can merge How do I resolve this error? 回答1: As shown in How does "not something we can merge" arise?, this error can arise from a typo in the branch name because you are trying to pull a branch that doesn't exist. If that