A programming discipline for tracking, storing and retrieving revisions of source code.

learn more… | top users | synonyms (2)

5
votes
0answers
68 views

Are there any other Git porcelains other than the default one? [on hold]

One of Linus's emails mentions the separation of the Git tools into the "plumbing" (usable by automated tools) and a user-friendly interface on top of the that (which has later come to be referred as ...
0
votes
1answer
43 views

How to best document source control folder hierarchy?

I'm looking for an easy way to document our source control folder hierarchy. I'm not talking about code documentation -- there are many good solutions for generating documentation from code comments ...
0
votes
1answer
36 views

Is it possible to deploy a maven artifact straight to a webserver?

Say I have my project that looks like /src/main/java/... /src/main/resources/... /src/main/webapp pom.xml And I have this stored in my version control, Git/SVN etc. My artifact has a signature ...
1
vote
0answers
27 views

Good practice to share resources in MVC web projects

If we are working on multiple ASP.NET MVC projects that share a lot of common stuff like CSS, Scripts, or even utility C# methods, etc... what is a good way to keep them in one place ? Currently I ...
-1
votes
0answers
23 views

Provide updates to a web-application. How should it be done?

I am new in web development and am about to complete a simple web-application using PHP, JS etc.. My next step is to deploy it to eg. liveserver.com. I am sure that I will be providing a lot of ...
20
votes
4answers
1k views

Should we be hosting code online?

We're looking for a good source control and project management solution at my workplace and I've suggested creating a GitHub organization and private repositories. I love GitHub for many reasons, but ...
2
votes
1answer
57 views

Should untouched repos get an updated version number at end of sprint?

Lets say we have a large project which is split across multuple repos. We have something like shared-functionality-repo GUI-repo REST-server-repo ...
6
votes
1answer
129 views

Best practices for version control in Unity?

I'm a bit confused how to use version control with Unity, especially with objects such as scenes or prefabs that are not just code. We had an issue recently when my colleague and I were working on ...
7
votes
0answers
97 views

After breaking our code into reusable bits, how do we test and deploy?

We started out with one developer, and one svn repo containing all our code: ^/foo/trunk/module-a ^/foo/trunk/module-b ^/foo/trunk/module-b/submodule-b1 ^/foo/trunk/website1 (at the time this was a ...
4
votes
2answers
104 views

Making minor edits elsewhere while working on a commit [duplicate]

I have a habit of constantly making minor edits to my code whenever I spot something I don't like - be it a bug or just some sloppy piece of code I see how to improve. Neurosis-Driven Development. ...
246
votes
14answers
24k views

Why does everyone use Git in a centralized manner?

I have used Git at my past two companies for version control. It seems from what I've heard that about 90% of companies use Git over other version control systems. One of the biggest selling points ...
1
vote
0answers
68 views

Working on the same file for two tickets

The company policy where I work is that code cannot be committed to SVN until a code review is complete. This is sensible enough as we don't want broken code ending up in the repo, but it does give us ...
7
votes
3answers
188 views

Version control on standalone (in-house) libraries?

Problem Statement At our company, we have various application projects that we work on and then we also have libraries that those projects need to utilize. I feel the need (based on some similar ...
5
votes
4answers
137 views

Easily accessible setup files for installation

The software product I work on has several services and user interfaces. There are separate setup files for each unit of the product for installation. We make customer specific changes and bug fixes ...
4
votes
3answers
109 views

Feature branch which never made it into develop

I am cleaning up our git repository and there is a feature branch which contains a prototype of an interesting feature which the management decided not to include soon in the product. What do you do ...
9
votes
4answers
202 views

How to determine if there is useful deleted code in source control?

So I was reading over this question Should I remove unreferenced code? Some of the advice was to delete unreferenced code since the code is in source control for reference in case it is needed ...
3
votes
1answer
95 views

Best ways to manage my Git repositories with projects sharing the same code [duplicate]

My background: I was programming for many years, but have never used a version control system. I felt, that such a system would save me a lot of time and allow me to be more productive, but I never ...
-2
votes
1answer
37 views

Handle multiple parallel wide modifications using branching in VCS

Here, the term of branch is understood as a git branch. I don't know how branch works in other VCS, but its probably VCS-agnostic. Given a branch base, and around it many other "satellites" branches, ...
2
votes
1answer
48 views

Workflow and process when branches have dependencies in git for code reviews

A fairly common workflow for working with git is: Fork master Make changes/add functionality in branch Make pull request for your branch vs master Merge pull request (after code review, automated ...
1
vote
2answers
100 views

Best practice for creating defined versions in git

In my company we have a 'production pipeline', which is a bunch of code which we use to produce data, with the data later shipped to customers. The code is still being developed, bugs get fixed etc. ...
3
votes
1answer
98 views

Should we use a monorepo?

My team is planning a migration from subversion to git. We support 3 applications... 1 is primarily for internal users, 1 is for corporate "partners" and 1 is for end users. These applications share ...
28
votes
7answers
1k views

How did version control work on microcomputers of the day in the 80s and 90s?

I'm curious to know how programmer teams typically managed their software development back in the 80s and early 90s. Was all the source code simply stored on one machine which everyone worked on, or ...
6
votes
1answer
102 views

Why use a dedicated “pushbot” user which automatically merges approved pull requests?

Most Github repositories I'm aware of use the following workflow for pull requests: one or several users with "contributor" privilege review the suggested changes and then one of them merges the pull ...
22
votes
6answers
569 views

Splitting coding progress into meaningful commits without too much overhead

When working on a fix or a feature, I sometimes stumble over other tiny issues that can be improved on the fly in a matter of seconds. When I do them immediatly and then commit the finished ...
3
votes
1answer
142 views

How to improve our source control process

Background: We are using agile project management and follow sprints to do development. We are using a single repository in bitbucket.org that uses mercurial. Repository is hosting 3-4 products. ...
-2
votes
3answers
177 views

What is the most elemental workflow for TDD?

Gradle is such an interesting build tool that it prompted me to look at Spock and JUnit -- which I've never done before. What is the basic workflow with TDD? My approach has been to do frequent ...
1
vote
1answer
65 views

Managing Opengl projects under Team Foundation Server

I am learning OpenGL/C++ by following a tutorial series on in2gpu. I set up my Project just like the autor did. It is an Empty Visual C++ Project. Inside the project I linked glew and freeglut, the ...
0
votes
0answers
48 views

How do I share SVN trunk with multiple branches? [duplicate]

I have a project that I have been working on for a couple years. The project has gone fine. The sales team has struck a deal with a separate client that wants to have its own changes to the existing ...
6
votes
3answers
106 views

Project Cleanup and Version Control Best Practices

Question Background: I have a rather large project that I started before I learned about a beautiful thing called version control. Now, I have a ton of files labeled with the convention ...
6
votes
4answers
222 views

Is there any downside to commit messages containing the ticket number

I was wondering if it would be good practice for commit messages to contain the ticket number they were apart of. It would be like 2568 Fix heating issue Summary of the issue with a bunch ...
5
votes
1answer
113 views

How can I organize my TFS structure such that a one-off project that pulls files from another project can be easily managed?

I have my main project set up very simply in TFS. I've recently begun making a few of my project components generic enough that I can sell them to other organizations using the software for which I ...
0
votes
0answers
26 views

Using ClearCase file revision system for a multiple teams for a single file

We use ClearCase for file revision system. If a particular common file is considered, there are about 1000 revisions through branches and sub branches, the main branch is getting updated, but nobody ...
8
votes
3answers
224 views

Git branching strategy for long-running unreleased code

At our team, in addition to individual units of work (Stories), we have longer-running themes of work (Epics). Multiple stories make an epic. Traditionally we've had feature branches for each Story, ...
6
votes
1answer
78 views

Optimizing a file type for compare tools

Context: I am developing a visual studio plugin that generates layer diagrams. I want the tool to be able to produce an intermediate output, which is the data representation of what is being rendered ...
1
vote
2answers
134 views

Should I use a single repo when multiple parts of the same project are running on the same server? [duplicate]

I'm planning a project that consists of the following parts: REST API in Lumen Web client in Laravel Product website in Jekyll These separate products are going to be running on the same server. ...
3
votes
1answer
112 views

Do I update the copyright header when i modify the source?

Suppose I were to modify a said piece of code and put it back on github, would I have to update the license header. This is the code(Licensed under the Apache License, Version 2.0): ...
5
votes
4answers
227 views

How to determine when to open a new branch or a new repository when using Git?

Currently I am working on a project to make a product for company X. The team I am working with is selling similar service to many company with similar product, where 40% of the code is reused and 60% ...
6
votes
3answers
117 views

Do we need to create local branches for the enhancements we are working on?

We just started implementing the Git source control for our project and the Admin says we should not be creating any new branches for the enhancements that we are working on instead everybody should ...
1
vote
3answers
115 views

Steps to begin versioning a web application

Until now, we have not had an application version strategy or version-ed our application. We are considering doing so with our next release. What are the minimum tasks necessary to transition to a ...
12
votes
2answers
262 views

Workflow, editing things not in your current task

Usually when I program, I have a clear task ahead of me, but find annoying things I'd like to clean up as I go on. Here I see three options: Do it later (may forgot/have to spend time adding a ...
2
votes
2answers
472 views

Making major version step in software development in separate repository [duplicate]

Currently we are planning to switch from our software version 5.x.x to 6.x.x. Such major releases contains in our case a lot of refactoring work and changing the software architecture. Instead of ...
2
votes
1answer
44 views

How to integrate modified generated code into the build process?

I'm using a code generator which has the following workflow: Configure stuff Generate code Modify generated code with user code at specifically annotated positions. If changes are required to the ...
12
votes
2answers
296 views

Continuous Deployment with gitignore

When doing continuous deployment with Git, how do you handle ignored files in gitignore? Those files are ignored for privacy reasons (i.e. don't want them pushed out to other remote repositories, ...
23
votes
6answers
841 views

How do I approach a complicated merge

Here is the deal, I have joined a new company and have been asked to finish off the work on a branch which hasn't been touched for almost a year. In the meanwhile, the master branch has been growing ...
118
votes
9answers
10k views

Maintain hundreds of customized branches over master branch

Currently we have one master branch for our PHP application in a shared repository. We have more than 500 clients who are subscribers of our software, most of whom have some customization for ...
12
votes
3answers
497 views

How can we keep track of which version of our code is in each environment?

My team currently uses a fairly simple branching/deployment process that looks like this: ┌────────┐ ┌────┐ ┌──────┐ Environments: │ DEV │ │ QA │ │ PROD │ ...
1
vote
2answers
54 views

Can version control systems use the filesystem log to capture changes?

I was trying to find a "perfect" syncing program between a network share and a local folder, when I realised that it's probably impossible to do it right unless all the filesystem operations were ...
0
votes
0answers
35 views

Is there value is putting test/build outputs under source control?

My colleagues insist on ploughing every bit of output data they can into subversion. I can't see the value in this practice and would much rather use a file system. The key offenders are build and ...
5
votes
2answers
401 views

Should we include Nuget PACKAGE folder in version control?

I would like to know In C# or VB.NET project should we include the PACKAGE folder (nugget package folder that is created to the root of my project that contain the nupkg files and other content) to ...
2
votes
2answers
75 views

Mercurial Branching from a branch

We are in a situation where the customer has requested an urgent deployment of the current features we are working on. These features are being developed in a mercurial branch named 'sprint 1' for ...