39
votes
5answers
2k views

Maintaining Two Separate Software Versions From the Same Codebase in Version Control

Let's say that I am writing two different versions of the same software/program/app/script and storing them under version control. The first version is a free "Basic" version, while the second is a ...
1
vote
1answer
117 views

Should we be using git branches or separate repositories?

So I have talked my employer into finally jumping on version control...up until now my experience with git has been for personal projects and freelance work where everything is on one server, or small ...
0
votes
0answers
46 views

What workflow would be preferable when working with Cloud9 and Git?

I'm working with a small team developing a web app. We're using Cloud9 to make collaboration and portability as simple as possible, but it's making it a difficult to determine what would be the best ...
4
votes
2answers
153 views

Sharing only part of code with git

The situation I have code which has features X and Y. Bob needs access to the code to help develop feature X further. Normally I would allow Bob to clone the code, but the problem is that feature Y ...
2
votes
2answers
132 views

Feature code + infrastructure code - how to structure the commits / JIRA issues?

Say that you work on a feature described by a single JIRA ticket and during the work, you: Create feature-specific code like the GUI or specific use-case behavior. Some of the code was generic so ...
14
votes
6answers
906 views

TDD and Version Control

I am currently learning about TDD and trying to put it into practice in my personal projects. I have also used version control extensively on many of these projects. I am interested in the interplay ...
2
votes
2answers
946 views

So I'm a developing a workflow with vagrant+git…does this make sense?

Relevant Background Details We've got two types of VMs (Utility Boxes & Web Servers) that developers need. We are going to be using git for version control. We have developers who have ...
1
vote
1answer
97 views

Keeping up with upstream changes while adding small fixes or even major changes

Often I need to apply some small fixes (to make them run on my environment) or even change some parts of the software (to tailor it to my needs) to software from outside. However this obviously ...
5
votes
3answers
1k views

Git workflow for small teams

I'm working on a git workflow to implement in a small team. The core ideas in the workflow: there is a shared project master that all team members can write to all development is done exclusively on ...
2
votes
1answer
190 views

Tracking work history in a git repo

Previous related questions: Code bases for desktop and mobile versions of the same app Git branching and tagging best practices Question: I have split my repo into three directories (swing, ...
12
votes
1answer
1k views

Git workflow / practices for a small project (flowchart in png)

I'm trying to come up with a personal workflow. I've put together a flowchart of the hypothetical lifespan of a release: one developer pushing to a public github repo + a friend helping with some ...
6
votes
5answers
828 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 ...
5
votes
2answers
4k 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 ...
9
votes
3answers
1k views

Github Organization Repositories, Issues, Multiple Developers, and Forking - Best Workflow Practices

A weird title, yes, but I've got a bit of ground to cover I think. We have an organization account on github with private repositories. We want to use github's native issues/pull-requests features ...
4
votes
2answers
247 views

Workflow of sharing code for small teams

Problem is, we have developed a small CMS, that is different per implementation (currently). Of course development of this is never complete. Sometimes, we are working on more than one project that ...
18
votes
10answers
2k views

Binaries in source control

When developing for embedded devices and other odd worlds, it's very likely your build process will include multiple proprietary binaries, using very specific versions of them. So the question is, are ...
7
votes
6answers
1k views

Best way to use source control for a project (1-3 people)

So my partner and I are working on a practice management system and at first we didn't use any version control, then I persuaded him to use git. At the moment our system is that we have three ...
5
votes
3answers
634 views

What should be the workflow with a git repository?

I work on several git repositories though on most not more than 2 people work. Mostly me and my boss. Very often when we work in parallel it happens that "git log" doesn't look so nice because of the ...
55
votes
4answers
9k views

What is the benefit of git's two-stage commit process (staging)?

I'm learning git and I've noticed that it has a two-step commit process: git add <files> git commit The first step places revisions into what's called a "staging area" or "index". What I'm ...