I have some open-source apps that use a component that was open-source but is no longer so, with its CodePlex repository and project page removed. Do I have legal right to create a branch from the last available source code snapshot available before the project was removed? ...
How can you put uncommitted changes to a branch TEST when I am at the branch master? ...
A commit isn't necessarily in a branch, so how do you see and manage these commits? Also, is it possible to look at these commits from gitk? Thanks a lot! PS: just to make things clearer, here is an example: git init git commit touch toto git add toto git commit -a echo $RANDOM > toto git commit -a git checkout f798e54 #checkout initi...
Hello! I have many projects depending on each other in trunk. I made several commits which led to dependency problems. I tagged /trunk to /tags/trunk-experimental and now want to "revert" the last N changes (which led to problems), so that my /trunk is good again. Can this be done in a straightforward way? I tried to just check out f...
Let us say I have a trunk and I create a branch (branch A) of it on Sunday making Revision 10. On Monday I work on both branch A and the trunk (branch A is responsible for Revision 11,12,& 15 while trunk is responsible from 13, 14, & 16). Tuesday I created a new branch (branch B) from the trunk (Revision 17). Wednesday I work on both ...
While helping a friend with a git problem today, I had to introduce a branch that needed to be totally separate from the master branch. The contents of this branch really had a different origin from what had been developed on the master branch, but they were going to be merged into the master branch at a later time. I remembered from re...
Hi all! I've been reading all the questions here on the subject of version control, but I don't think i found a scenario that looks like my own. The scenario is: we've got a medium/large sized web application that has (at least it should have) a core that is deployed to all clients. When we make demos of the application to the clients...
I started some work on a new feature. After coding for a bit I decided this feature should be on its own branch. How do I move the existing uncommitted changes to a new branch and reset my current one? I want to be sure that I can reset my current branch while preserving work on the uncompleted feature. ...
When I try to create a new branch tracking a remote branch, I get this: che@nok ~/prj/git-ipc $ git branch -t test main/some_remote_branch error: Not tracking: ambiguous information for ref refs/remotes/main/some_remote_branch The source seems to somehow search for branches to track and throws me out because it finds less more than on...
I started work on what I thought would be a minor bug fix on my master branch. However, it has spiraled out of control to the point where I wish I had created a separate branch to do the development in the first place. So right now what I'd like to do is: Create a new branch called (say) "edge" Move all the changed / untracked files o...
Recently I switched from SVN to Mercurial. Now I wonder how to realize my intended branching work flow in Mercurial according to good practice, hoping other developers understand what happens in the repository. This is the work flow: Usually I have a trunk/default branch where work on the current release series happens. Let's say that...
How can you merge two branches in git, retaining necessary files from a branch? When merging two branches, if a file was deleted in one branch and not in another, the file is ultimately deleted. For example: A file exists in master when you make a new branch you remove the file from master since we don't need it (yet) you make change...
Hi. I'm newbie in Git. I have read: "Pro Git : Maintaining a Project" (book) and Git : Documentation/howto/maintain-git.txt Tough question for me: how to mantain the old releases without creating a separate long-lived branches. In other words, I am interested how to working with a branch "maint" in the project Git. In example (mergin...
This morning, I read two opinions on refactoring. Opinion 1 Opinion 2 They recommend branching (and subsequently merging) code to: Keep the trunk clean. Allow a developer to walk away from risky changes. In my experience (particularly with Borland's StarTeam), merging is a non-trival operation. And for that reason, I branch only ...
I have a large project that I was upgrading to edge Rails. I made a copy of the entire project directory and refactored there as a precaution to trusting git (or at least how I might use/misuse it). After completing most of the work I returned to the original project directory and at the console (this is from memory and so is loosely b...
I'm trying to keep my static files in a separate branch so that I can keep them from merging into my master brach (on Heroku, your application's slug needs to stay small). I don't want to ignore my static files, because I want to keep them inside my "devel" branch. Ideally I'd like to keep test.db blank and my entire public folder blan...
We have the following code structure: $ |-Core | |- Project1 | |-CoreFile.cs | |- Project2 | |- ... | |-NewProject |- Project1 | |-CoreFile.cs | |-NewFile.cs |- Project2 |- ... We have branched core into Project as a starting point and are adding files into NewProject solution's projects. What we...
Here's an interesting experiment with using Git. Think of Github's ‘pages’ feature: I write a program in one branch (e.g. master), and a documentation website is kept in another, entirely unrelated branch (e.g. gh-pages). I can generate documentation in HTML format from the code in my master-branch, but I want to publish this as part of...
We have a Current branch where the main development happens. For a while I have been working on something kind of experimental in a separate branch. In other words I branched what I needed from the Current branch into an Experimental branch. While working I have regularly merged Current into Experimental so that I have the changes others...
Let's say I create two banches at the same time: hg branch branch-A hg branch branch-B How do I send my next commit to branch-A instead of branch-B? ...