branch

问题 I love the flexibility of named branches but I have some concerns about the prolifieration of heads. Even when the branch is closed, it still shows up in the heads. I have an idea for how to clean up the output from "hg heads" My question to the gurus: "What am I missing?" First off you may ask, Why might I want to totally hide the head of a named branch? For various reasons: the feature is a bad idea the feature is a good idea that is not ready for merging to tip, but maybe in a few months

问题 Once you have finished/reintegrated a branch, is it best practice to delete the branch so your head branches folder only shows current branches? If so, what would be a suitable time to delete reintegrated branches? After a minor release (which is when we tag). Cheers 回答1: According to this, it is recommended to delete your reintegrated branch immediately after reintegration and create a new one with the same (or different) name instead. 来源： https://stackoverflow.com/questions/3528464/svn-best

问题 I'd like to automate cleaning of remote branches. I want to be able to check to see if a branch has been merged into master already. Originally, my plan was to use git merge-base to see the last common commit. However, it turns out that we squash all of our branches as we merge them into master. As this creates a new commit hash, I'm unable to find the common commits between master and my branches. How might I go about determining if a branch has been merged if we've squashed them all when

问题 I am new to GIT. I want to create a new branch: I have 3 files inside that repository. If I create a new branch, do I have to copy that files; Or are they copied automatically if I create a new branch? When I want work on the branch, do I have to switch to that branch inside GIT, before I start to work (opening that files)? Thank you very much for your help 回答1: I want to create a new branch # checkout new branch based upon the current branch git checkout -b <new branch name> If I create a

问题 We are using the release number for TFS branches. I have just created a new TFS branch with an upcoming release number. However, the client has since changed the release number which we would like to keep parallel TFS branch name. The branch is new and no changes have been made to it yet. What issues I can expect if I rename the branch? Is it better to create new branch from main with the new release number? 回答1: A rename is a branch+delete under the covers. You would be best creating a new

问题 I have a single Subversion repository containing all my Visual Studio projects. The repository is organized as follows: repository/ branches/ project1_branch/ ... tags/ project1_tag/ ... trunk/ project1/ project2/ ... When I right-click on a particular solution I have open in Visual Studio 2010 and choose Subversion --> Branch Solution the default From Folder/URL is the trunk directory. How can I create a branch of just the specific solution/project I am working on? Thanks in advance for your

问题 I have a hg repo. I used to have a short-lived branch named "1.x", which stemmed off "default" at a certain point in time. It got closed because I didn't feel the need to use that branch at that particular moment. However, I was forced to abandon the way "default" was developing and create another branch at a much earlier revision, way before creating "1.x". I was unable to use the name "1.x", so I called it "oldui". The branch "default" was closed as a dead end. I feel uncomfortable with

问题 I have an unclear understanding about merging on git, which I would like to understand correctly. Let's say, I have a file F on master branch, which has already 100 LOC. I create a branch A from master, and I write 50 LOC, starts from line 101th to line 150th. I create a merge request to merge branch A to master. So if branch A will be merged, then file F on master will have 150 LOC Let's assume branch A isn't merged to master yet, still waiting. And I create a new branch B from master. I

问题 I know how to remove a specific commit from the git history with git rebase --interactive . My question concerns the more complex case with a history like this: A--X--B--C--D \ E--F where I would like to remove the commit X . The issue is that in this case there are two or more branches with parents ( B in this case) that have X in their history, so a single git rebase -i will not do the trick (at least I do not know how). Is there a simple way to remove X , or do I have to rely on rebasing