Git is an open-source DVCS (Distributed Version Control System)
3
votes
1answer
142 views
How to distribute a web app (that's hosted by the customer)
We're developing a web app that visualizes financial data. We have our first customer, but hope to get more. The terms are that
the customers pay a setup fee, to customize the app for their needs
...
2
votes
2answers
588 views
BitBucket working with multiple developers on same project
I am new to BitBucket. I have my repository. And 2 people working on it me, Admin and another developer with Read only access.
So in order for him to do changes he forked repository and made changes, ...
0
votes
0answers
244 views
git extensions integration into VS and commit problem
I'm not sure what I'm doing wrong - but I have the following problem. I made a clone of my repository on github on my harddisk. I commit every change to that clone using the "Git Pending Changes" view ...
4
votes
3answers
351 views
What is an effective git process for managing our central code library?
Quick background: we're a small web agency (3-6 developers at any one time) developing small to medium sized Symfony 1.4 sites. We've used git for a year now, but have previously used Subversion.
For ...
23
votes
6answers
2k views
How to choose between git and Mercurial
Both Git and Mercurial are DVCS, and that's great. I wonder if there is a list of particular situations when one of those systems are preferable, something like 'In mobile development for many ...
8
votes
3answers
1k views
Git Project Dependencies on GitHub
I've written a PHP framework and a CMS on top of the framework. The CMS is dependent on the framework, but the framework exists as a self-contained folder within the CMS files. I'd like to maintain ...
3
votes
4answers
355 views
Approaches to manage related binary files, apart from code
I'm working on a website for a photographer, the whole code is just a few files, and whole repository is a few MBs without the actual photographs.
But, when I add the actual photographs to git and ...
12
votes
2answers
403 views
What's the proper way to check commit data in Git?
My goal is to check commit data that don't meet certain requirements and then reject either the commit being created or pushed to the remote repository.
The problem of doing a pre-commit hook is that ...
8
votes
2answers
1k views
Can I migrate a clone of Google Code repository into Github?
I want to create a clone of a Google Code repository, which I cannot download due to Country restrictions and I want to migrate that clone into Github, which I can use without any problem.
The thing ...
8
votes
2answers
219 views
What is the canonical approach to using a VCS right from a project's infancy?
Background
I've used VCS (mainly git) in the past to manage many existing projects and it works great. Typically with an existing project, I would check in each change I make to the code that either ...
17
votes
2answers
3k views
Empirical Evidence of Popularity of Git and Mercurial
It's 2012! Mercurial and Git are both still strong.
I understand the trade-offs of both. I also understand everyone has some sort of preference for one or the other. That's fine.
I'm looking for ...
11
votes
2answers
362 views
Many small scripts, one repository or multiple?
A co-worker and myself have run into an issue that we have multiple opinions on.
Currently we have a git repository that we are keeping all of our cronjobs in. There are about 20 crons and they are ...
11
votes
8answers
2k views
From TFS to Git
I'm a .NET developer and I've used TFS (team foundation server) as my source control software many times. Good features of TFS are:
Good integration with Visual Studio (so I do almost everything ...
10
votes
4answers
1k views
Using git correctly in a small team
What would be the easiest way to use git correctly in a small team of about 5 developers, with one server running the live application?
1
vote
2answers
289 views
Git, auto updating, security and tampering?
I was thinking about hosting my private project on my server (i may use 'gitolite') and have a copy on my local machine as backup (git clone then automated git fetch every few minute). I want to know ...
2
votes
1answer
394 views
Gerrit, git and reviewing whole branch
I'm now learning Gerrit (which is the first code review tool I use). Gerrit requires a reviewed change to consist of a single commit. My feature branch has about 10 commits.
The gerrit-prefered way ...
1
vote
2answers
449 views
Can I do a git merge entirely remotely?
My team shares a "work" branch and a "stable" branch. Whenever a particular work branch is approved for further testing/release/etc, we merge it into stable. No code is ever checked directly into the ...
2
votes
1answer
195 views
Useful versioning scheme for a git project?
I have a small github project, which I need to add an option to to output some version number on the commandline.
The problem is I have no idea how to "compute" the version number. Is this some ...
2
votes
4answers
659 views
Using Mercurial repository inside a Git one: Feasible? Sane?
I am thinking on creating a Mercurial repository under a Git repository.
e.g.
..../git-repository/directory/hg-repo/
The 2 repositories
Is it possible to manage (keeping your sanity)? How similiar ...
1
vote
2answers
173 views
Bad idea to display mail server info in public github project?
I have the project for work that requires me to send e-mails to people using our work mail server. The server doesn't require authentication. Part of my project is using a Java-Helper I'm developing ...
1
vote
1answer
209 views
How should my local git workflow work?
At home, I have a server that is running some software (on a LAMP stack, but only accessible internally). I have another machine and a laptop that I both use for developing said software. What is the ...
7
votes
1answer
215 views
Git bug branching convention
I've been following the successful Git branching model guide for most of my development. I still wonder if the way I handle bug tickets is correct.
My current workflow: Once I accept a bug ticket I ...
3
votes
2answers
199 views
Is there a decent way to maintain development of wordpress sites using the same base?
We've been churning out wordpress sites for a while, and we'd like to keep a base repository that can be used when starting a new project, as well as updating existing sites with changes to the ...
4
votes
1answer
404 views
Two git repositories, one project
I am building an app using Code Igniter, it is being based on CI-Bonfire.
I am pulling in the dev branch of CI-Bonfire using git, I want the entire project to be git controlled as well, but I want to ...
25
votes
10answers
1k views
Do DVCSes discourage continuous integration?
Say there is a team of ten agile developers. Every day they each pick a task from the board, commits several changes against it, until (by the end of the day) they have completed the task. All ...
0
votes
1answer
108 views
Tame a mess — backup & revisions across several systems? [closed]
I am a freelance mobile & back-end developer, and have many projects spread out over 4 systems - 2 Win7, Mac OSX and Ubuntu. Some of the projects need to be checked into the client's source ...
5
votes
2answers
700 views
Good continuous-integration solutions for Haskell projects
I am looking for a good CI solution for a haskell project. Ideally something that will work with git. Really basic need (so far) build and run tests after each check in. Some basic reporting would be ...
4
votes
1answer
861 views
Why do Git/Mercurial repositories use less space?
I've read on several discussions here and on SO that DVCS repositories use about the same or less space than their centralised counter-parts. I may have missed it, but I haven't found a good ...
2
votes
8answers
318 views
When and how to commit?
I'm getting used in working with git at the moment. And I'm touching an issue that is unclear to me.
I feel compelled, if I think of commiting after a change and making a documenting description. I ...
30
votes
8answers
2k views
Should a git commit message mention the file that was modified?
In the first line of a git commit message I have a habit of mentioning the file that modified if a change doesn't span multiple files, for example:
Add [somefunc] to [somefile]
Is this a good ...
2
votes
1answer
196 views
Can/Should I put my Git repository on a non-dev machine and keep it synced with the non-version control server?
I volunteer for a website, and well, basically, we don't have version control. We're working to change that, but because of several things, including the fact that I haven't worked with source control ...
5
votes
7answers
1k views
people fork my project but don't fetch from upstream - what can I do?
Several people have forked my github repo but they have not fetched-merged from upstream. So my original repo has evolved significantly since the fork took place, and meanwhile these people are ...
1
vote
2answers
187 views
Will the customer benefit from a DVCS in any way?
Some of us can say a Distributed Version Control System (e.g. Mercurial, git) will have a positive impact on developers only out of the experience of using one (under the right conditions: higher ...
2
votes
1answer
679 views
Pulling in changes from a forked repo without a request on GitHub?
I'm new to the social coding community and don't know how to proceed properly in this situation:
I've created a GitHub Repository a couple weeks ago. Someone forked the project and has made some ...
2
votes
1answer
257 views
How should “git add /**” work?
As noted in this question, I ran into an issue with git add /**.... I can't actually find any documentation on the "/**" form of path specifications - possibly because it's hard to google.
How is it ...
3
votes
1answer
271 views
Command line merge conflict tools
I sometimes prefer to work in a terminal. I use git, and sometimes have merge conflicts. Are there any merge-conflict-resolution tools that work in a command-line only environment?
15
votes
6answers
667 views
How can I refactor a code base while others rapidly commit to it?
I'm on a private project that eventually will become open source. We have a few team members, talented enough with the technologies to build apps, but not dedicated developers who can write ...
2
votes
4answers
443 views
Best practices for team workflow with RoR/Github for designer + coder?
My friend and I have started to try to collaborate on some projects. For background, I come from a PHP/Wordpress/Drupal coding background, but recently I've become more experienced with the RoR ...
31
votes
13answers
4k views
To branch or not to branch?
Till recently my development workflow was the following:
Get the feature from product owner
Make a branch (if feature is more than 1 day)
Implement it in a branch
Merge changes from main branch to ...
5
votes
4answers
1k views
Subrepositories (submodules) as a dependency tracking solution - yes or no?
What do you think about SCM-based (subrepositories in mercurial, submodules in git) dependencies management?
Is it definitely a good way of managing dependencies? Or definitely bad way?
Should I ...
3
votes
2answers
456 views
Are any companies moving from DVCSs to CVCSs? [closed]
Are there any actual business cases that have made any company move from a DVCS to a CVCS (regardless of whether they were on a CVCS originally)?.
Other than having a closed mind and rejecting the ...
4
votes
3answers
252 views
Which revision control system to use for 2 semester capstone course? [closed]
For CS undergraduate students working on a 2-semester capstone course without any prior exposure to revision control systems, what would be a good one to use?
Desirable qualities would be easy to ...
4
votes
4answers
336 views
How can I get programmers to work together better on shared code with tests
We keep repeating "you have to pull first" (this is git and github by the way). Then you code a little, then get your tests to pass, then commit, then pull and push again. We give tutorial links, ...
6
votes
3answers
358 views
Does Git have a “safe mode” to prevent rewriting history?
When you're kind of fresh with Git (and DVCS in general), and you start exploring history-rewriting changes, you're safe if the repository is only local, but you might run into problems if you work ...
1
vote
2answers
241 views
Importing an existing project into Git
Background
During the course of developing our site (ASP.NET), we discovered that our existing source control (SourceGear Vault) wasn't working for us. So, we decided to migrate to Git. The ...
2
votes
1answer
114 views
Git: Pushing to a remote repo from a remote repo?
I have a destination repo that is remote and I have a source repo
that is also remote. I would like my local machine to act as a proxy
to allow me to push to the destination from the source without ...
7
votes
1answer
160 views
Tool to identify potential reviewers for a proposed change
Is there a tool that takes as input a proposed patch and a git repository, and identifies the developers are the best candidates for reviewing the patch? It would use the git history to identify the ...
6
votes
2answers
2k views
git, maven and jenkins - versioning, dev and release builds workflow
What is the preferred way to do the following with git, maven and jenkins:
I am developping an application, which I would like to maintain "dev" and "release" branches. I would like jenkins to build ...
-5
votes
2answers
401 views
Reasons to Use Version Control [duplicate]
Possible Duplicate:
I'm a Subversion geek, why I should consider or not consider Mercurial or Git or any other DVCS?
What is the value of using version control?
I am a relative noob ...
4
votes
2answers
3k views
Examples of continuous integration workflow using git
Can anyone provide a rough outline of their git workflow that complies with continuous integration. E.g. How do you branch? Do you fast forward commits to the master branch?
I am primarily working ...
