I have a branch that should be available to other contributors and that should constantly stay up to date with the master. Unfortunately, every time I do 'git rebase' and then try to push, it results in 'non-fast forward' message and abortion of pushing. The only way to push here is to use --force. Does that mean I should use 'git merge...
The team where I work still uses SUN Teamware for Source Code Management (SCM). I've worked with it for a while now (over 10 months) and I don't have any particular complaints about it. Teamware has been used to manage Sun’s largest source trees, including those for the Solaris operating system and the Java system, and it works pretty w...
Below svn branches have been added into .git/config file. [svn-remote "svnb02"] url = https://svn/repos/Project/branches/b02 fetch = :refs/remotes/git-svn-b02 [svn-remote "svnb03"] url = https://svn/repos/Project/branches/b03 fetch = :refs/remotes/git-svn-b03 But only "svnb03" can be fetched using bel...
Assuming that I'm starting a new web project at home using Visual Studio, which version control system, viz. Git or Subversion will be better to use? Which one will have the least setup complexity? ...
StarTeam has file sharing between views. Basically a view in StarTeam can share individual files from other views. It can then branch the files as well. Are there ways to migrate views in StarTeam that share hundreds of files with each other? Anyone have experience with this? Assuming that the only solution is to convert one StarTeam ...
I have a project that relies upon another 2 subprojects that have been merged using the subtree merge strategy (as described here and there)? After a while, I have noticed that one of the subprojects is having his own lifecycle inside the current project, so I'd like to decouple it from the original, but I have no idea how to achieve th...
I've got a 'git-svn' working tree. I'd like to clone a "pure" git repo off this, and then use git push/pull to move changes between the git-svn tree and the git tree, while also using 'git svn dcommit/rebase' to move changes between the git-svn tree and the SVN repo it's based on. This seems to work okay as far as moving things back and...
I have two SVN project using sharing another SVN using svn:externals. I want to have that same structure with GIT but I can't find how. ...
Subversion, Git, Mercurial and others support three-way merges (combining mine, theirs, and the "base" revision) and support graphical tools to resolve conflicts. What tool do you use? Windows, OSX, Linux, free or commercial, you name it. Here's a few that I've used or heard of, just to get the conversation started: kdiff3, DiffMerge,...
The command git add [--all|-A] appears to be identical to git add .. Is this correct? If not, how do they differ? ...
Folks I'm facing repeated code conflicts while pulling from the shared git repo in the following scenario: There is a common svn repository There are several developers who track/sync this common svn repo with their own local git repos using git-svn bridge(via git svn rebase/dcommit) From time to time these developers using git need to...
I'm relatively new to Git, but I've found it so easy to work with at home that I'd like to use it at work where our projects are stored in Svn repositories. Unfortunately, the repositories are slightly non-standard and I'm having trouble getting them cloned. Sure, they all have trunk, branches/ and tags/, but branches/ and tags/ have sub...
I'm a recent git convert. It's great to be able to use git-svn to keep my branches locally without disturbing the svn server. There was a bug that existed in the latest version of the code. I wanted to establish a time when it worked so that I could use git bisect. I couldn't find the right command to move back in time. Thanks. ...
It seems that my initial commit is eating up 90% of the space, since it accidentally got made with quite a lot of media files in it. Is there a way to remove just the first commit from local and remote repos, or should I just leave this one be? ...
With gitosis, is it possible to specify write permissions so that users can push freely to branches with their own name, but not merge with the master? E.g. $USER/test1 .. $USER/test5 This mean you could host just one repository per project, rather than hosting multiple repositories for the same project, specific to each user: project...
I was wondering if there is a way to get vim to read .gitignore files and use them to determine options not to present when auto-completing filenames. For example, working in python, I'd like to not see .pyc files offered for editing. I think vim has its own mechanism for this, I was wondering how to load information from .gitignore in...
Git newbie here. I'm building an iPhone app with PhoneGap, which has a Git repos. I'd like to keep track of my changes to the PhoneGap code (mainly, adding files to the www directory) in my own Git repository, while being able to pull the latest and greatest out of PhoneGap. What's the best way of doing this? Is this what a branch is i...
I've been fighting the git/git-svn learning curve and last night, as part of that learning curve, I did something very, very bad. I've since gotten it corrected, but I'm hoping to understand the error my ways. I have an svn repository from which I've cloned the trunk and branches (tags I ignored since we don't work on those). Using git...
I'm going to be working with other people on code from a project that uses cvs. We want to use a distributed vcs to make our work and when we finish or maybe every once in a while we want to commit our code and all of our revision history to cvs. We don't have write access to the project's cvs repo so we can't commit very frequently. Wha...
I want to share (and keep updated) some base code between my rails projects with git. How can i do? ...