Hi! I am soon starting to maintain a line of products containing variants of the same embedded software. Since I've been playing with git for one year and appreciate it very much, I'm likely to use it for source control. There are several options I can see for maintaining the variants of the firmware, but none pleases me too much. What...
If I create a branch: hg branch branch-A and commit to it: hg commit -m "improvement A-1" and then create a second branch: hg branch branch-B and commit to it: hg commit -m "improvement B-1" If I want to add my next change to branch-A do I simply type: hg branch branch-A and commit to it as before: hg commit -m "improveme...
I have not found a really simple "how to" any where so I came up with my own through trial and error and wanted to share it, i.e. I will answer this question myself. ...
We make use of a significant number of branches (a fairly traditional mainline model) for development, and it's proved extremely effective as a way of organising things and keeping developers efficient on a large team. We have QA test development branches before pushing them back to the main line, which ensures the main line is always s...
I am looking for suggestions for how to structure projects using git repositories and branches. Assume I want a remote repository, and my project is a website that uses a Flash widget. The Flash widget is compiled from source code that I've written. To deploy my website, I would like the production server to just be another git client...
I am working on a feature branch and have some changes committed to my feature branch that will affect the other developers. I would like to commit those new changes to the trunk so that nobody is left scrambling to fix the break later; however, I do not want to commit the rest of the feature branch because it is not yet fully functiona...
In my git repository, I have merged branch "B" into "master", getting the the following structure: --> A --> B --> C --> D (branch master) | | F --> G --> H (branch B) I now want to combine the branches to get the following history: --> A --> B --> F --> G --> H --> D How can I do this? Regards, Jochen ...
Sometimes I'm in a feature branch, but I've made an unrelated change that I want to see in master. Often I can just do: git checkout master git commit -m "..." filename But sometimes when I do the checkout I get a warning that there are local changes and thus I can't switch the branch. Why does this only happen sometimes? Is there ...
We are team of 4 developers/friends located in different locations. We all have started working on the a ProjectX and created branches A, B, C and D using Subversion. we have just basic knowledge of version controlling the source code. Other day one of us just tried to merge Branch A with B,C, and D and B tried to merge with A, C, and D...
So we're gradually moving all our projects across into SVN, from CVS. One project in particular has two parallel development streams that share a lot of code, and they accomplish this with a neat trick on branch tags. Some files are branched normally as they diverge on the different streams: foo.c 1.18 --- HEAD, VERSION-1...
I was wondering if git is suitable for this. So here is the scenario: We are thinking about hosting a game server. However it is not the case of just downloading files and running the server. It needs to be carefully configured and maintained. It also has scripting capabilities. Also, there will be quite a few "developers" who are going...
I just started working on some changes against trunk on an SVN repo, thinking they would be somewhat small. Now, I actually am beginning to realize that I probably should have just started a new branch instead. Rather than making a branch, and then moving each individual piece into it, is there any way to make a new branch and then com...
I created a local branch which I want to 'push' upstream. There is a similar question here on Stackoverflow on how to track a newly created remote branch. However, my workflow is slightly different. FIRST I want to create a local branch. And I will only push it upstream when I'm satisfied and want to share my branch. How would I do th...
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 present we are using VSS for code...
I have the branch master which tracks the remote branch origin/master. I want to rename them to "master-old" both locally and remote. Is that possible? For other users who tracked origin/master (and who updated their local master branch always just via 'git pull'), what whould happen after I renamed the renamed the remote branch. Would ...
I've been thinking over some branching strategies (creating branches per feature, maybe per developer since we're a small group) and was wondering if anyone had experienced any issues. Does creating a branch take up much space? ...
I have a repository with branches master and A and lots of merge activity between the two. How can I find the commit in my repository when branch A was created based on master? My repository basically looks like this: -- X -- A -- B -- C -- D -- F (master) \ / \ / \ / \ / G -- H -- ...
Typical usage scenario: I have master, branch_foo and branch_bar. All are up to date. Now, I do a "git checkout master" and work on a bug fix. Lets say that fix was on a tracked file that is in the same state on all branches - ie. before the fix, a diff of the file from each branch results in no differences. Is there a way to commit...
Hi, After my first question, id like to have a confirmation about the best git workflow in my case. I have a single django project, hosted at github, and differents clones with each his own branch : customerA, customerB, demo... (think websites) Branches share the same core but have differents data and settings (these are in gitignor...
I had a private branch that I did a ton of commits to, then I merged it into trunk, and did a few little tweaks there. Now the trunk maintainer wants a diff off all of my changes incase we need a rollback. How can I create this? If you need numbers for your examples, assume that 224446 was my main revision where I merged into trunk, ...