branching-and-merging

问题 We have multiple developers working on a project. We're employing a feature-branch method of branching in which we do the following: All maintenance work and bug fixes are done on the trunk All new functionality is done on a new branch Branch is updated regularly (via merging changes from trunk to branch) However, we've run into a situation that 2 branches [we'll call them feature-branch-1 and feature-branch-2] need to be merged together. What is the best way to accomplish this? Part of me

问题 Can anyone explain why git describe uses a count as "the number of commits which would be shown by git log tag..input" [from git-describe(1)]? Conceptually I had thought git-describe used the number of commits since the tag as a monotonically increasing counter. However, it seems it actually uses the number of commits reachable from 'input' minus those reachable by 'tag'. Why is that? In this particular case, I've created a release tag ("1.0.0") and then a patch release ("1.0.1") on a branch

问题 The documentation on branching in Fossil SCM says a leaf is considered closed if it has a closed tag. However, when I enter > fossil tag add closed xxxxx > fossil leaves --closed > it doesn't show anything as closed. The same thing happens if I add the tag with --propagate . When I check closed leaves of Fossil itself, the leaves listed have no closed tags displayed. What am I misunderstanding? 回答1: Use fossil tag add --raw closed check-in Another way to do it is start the user interface, go

问题 The documentation on branching in Fossil SCM says a leaf is considered closed if it has a closed tag. However, when I enter > fossil tag add closed xxxxx > fossil leaves --closed > it doesn't show anything as closed. The same thing happens if I add the tag with --propagate . When I check closed leaves of Fossil itself, the leaves listed have no closed tags displayed. What am I misunderstanding? 回答1: Use fossil tag add --raw closed check-in Another way to do it is start the user interface, go

问题 The documentation on branching in Fossil SCM says a leaf is considered closed if it has a closed tag. However, when I enter > fossil tag add closed xxxxx > fossil leaves --closed > it doesn't show anything as closed. The same thing happens if I add the tag with --propagate . When I check closed leaves of Fossil itself, the leaves listed have no closed tags displayed. What am I misunderstanding? 回答1: Use fossil tag add --raw closed check-in Another way to do it is start the user interface, go

问题 We have the following source control structure in our development environment: a Main branch, which is the root of all branches, and a Development branch, which is the son of the Main. Now, I recently did a "Rename" on the Main branch, and now it's called OldMain, and after that created a new branch from Development, which I called it Main. After I finished with those operations, I realized that it has some strange behavior: The OldMain branch lost his history, which can't be retreived, and

问题 Say I have a branch A, and from that I branch B. I make a bunch of changes on A, then checkout B and do a git pull . Now I make a change on B but realize that it should've been in A. If I now try to git checkout A , I get "Your local changes to the following files would be overwritten by checkout" to the file I touched. Why would my change be overwritten if I just did a git pull in B and haven't touched that file in A since? 回答1: The reason you get that message is that the underlying file

问题 Here is the riddle: C:\code\trunk> svn merge --reintegrate http://svn.e.com/repos/branches/lih --accept postpone --dry-run svn: E195016: Reintegrate can only be used if revisions 11430 through 12384 were previously merged from http://svn.e.com/repos/trunk to the reintegrate source, but this is not the case: branches/lih Missing ranges: /trunk:11902 But then if I go into the branch's directory and try to merge that range, there is nothing to merge! C:\code\branches\branch> svn merge -r 11901

问题 Simple example. This is 'master': root - index.html - readme.md This is a branch called 'dev': root src - index.jade dist - index.html I'd like to take the index.html file (or all files, really) in the 'dist' folder of the 'dev' branch and replace or merge it with the one in the root directory of my master branch. I've tried, from master: git checkout dev dist/ But it produces this result: root dist - index.html - index.html Clearly not what I want. Is git capable of doing what I want it to

问题 I need to use 3rd-party code that's available publicly on github. I'm looking at the github's network graph of that code and I can see that other forks have some commits that aren't merged into the original repository. How should decide which of the branches/forks is right for me? Please enlist your considerations while facing a problem like this. As suggested by John Feminella, one should always use the (usually stable) 'released versions of a project'. I agree with that of course, but this