This posting here (http://stackoverflow.com/questions/156044/how-do-you-manage-database-revisions-on-a-medium-sized-project-with-branches) got me wondering how best to work on a web project using branching and deploying to dev, staging, and production (along with local copies). We don't have "releases" per se: if a feature is big enough...
I use Subversion via TortoiseSVN but I hear good things about Git. Are there any similar tools available for Git on Windows? Feel free to answer with tools which still in early development. ...
According to the manual, git dcommit “will create a revision in SVN for each commit in git.” But is there a way to avoid multiple Subversion revisions? That is, to have git merge all changes prior to performing the svn commit? ...
I've been wondering whether there is a good "git export" solution that creates a copy of a tree without the .git repository directory. There are at least three methods I know of: git clone followed by removing the .git repository directory. git checkout-index alludes to this functionality but starts with "Just read the desired tree int...
I am starting a new distributed project where some of the developers will not be in the same country... What should I use: Git or SVN? Why? PS. It is a smart client application running on windows and will be developed using Visual Studio [UPDATE] And does it work on MacOS (Not required but interesting to know)? ...
Do you know a good way to explain how to resolve merge conflicts in git? ...
I am trying to figure out what is the 'grafts' in the Git. For example, in one of the latest comments here, Tobu suppose to use git-filter-branch and .git/info/grafts to join two repositories. But I don't understand why I need these grafts? It seems, that all work without last two commands. ...
Basically I wanted to do something like git push mybranch to repo1, repo2, repo3 right now I'm just typing push many times, and if I'm in a hurry to the the pushing done, I just send them all to the background git push repo1 & git push repo2 & I'm just wondering if git natively supports what I want to do, or if maybe there's a clever s...
We're working with a semi-centralized git repository here where I work. Each developer has their own subtree in the central git repository, so it looks something like this: master alice/branch1 alice/branch2 bob/branch1 michael/feature release/1.0 release/1.1 Working locally in my tree I have topic/feature, which corresponds to michael...
I tried committing files with CRLF-ending lines but it failed. I spent a whole work day on my Windows computer trying different strategies, and was almost drawn to stop trying to use git and instead try mercurial. Please share only one best practice per answer. ...
How can I find out which remote branch a local branch is tracking? Do I need to parse git config output, or is there a command that would do this for me? ...
When using Mercurial I sometimes find that it is hard to understand the relationship between changesets when there are thousands of changesets, and sometimes ten or more active branches at any one time. Currently, I use hgview which is okay, and while it makes a reasonable attempt to represent the parent relationships it is still basica...
When merging topic branch "B" in "A" using git merge, I get some conflicts. I know all the conflicts can be solved using the version in "B". I am aware of git merge -s ours. But what I want is something like git merge -s their. Why it does not exist? How can I achieve the same result after the conflicting merge with hot git commands? ...
I stupidly did a git commit while half asleep, and wrote totally the wrong thing in the commit message, How do I change the commit message? I have not yet pushed the commit to anyone ...
Is it possible to check out subdirectories of a repository in Git? Imagine I am setting up a new WordPress installation. I will create two new directories for my plugin and theme customization: wordpress/wp-content/plugins/myplugins/ wordpress/wp-content/themes/mytheme/ I want to maintain these directories via Git. In Subversion, I...
fatal: git checkout: updating paths is incompatible with switching branches/forcing Anyone know how to get past this git checkout error? ...
Is it even possible? Basically, there's a remote repository from which I pull using just: git pull Now, I'd like to preview what this pull would change (a diff) without touching anything on my side. The reason is that thing I'm pulling might not be "good" and I want someone else to fix it before making my repository "dirty". ...
Are there any good git tutorials available somewhere, except for the official tutorial? I like the mercurial book, but haven't found anything similar for git. I would like to start using git in some projects, and would therefore be able to point my colleagues to some good reading material. In this particular case, they are still mostly ...
My motivation for trying out git-svn is the effortless merging and branching. Then I noticed that man git-svn(1) says: "Running git-merge or git-pull is NOT recommended on a branch you plan to dcommit from. Subversion does not represent merges in any reasonable or useful fashion; so users using Subversion cannot see any merges you've m...
A word of warning: I'm a n00b to git in general. My team uses feature branches in svn, and I'd like to use git-svn to track my work on a particular feature branch. I've been (roughly) following Andy Delcambre's post to set up my local git repo, but those instructions seem to have led git to pick the svn branch that had changed most recen...