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

learn more… | top users | synonyms (2)

0
votes
0answers
16 views

Use git to keep repository of small unrelated applications

I find myself writing small test cases and applications to post bug cases, answer questions in some forums, make feature showcases for clients, etc. and for that I created a TestCases project inside ...
1
vote
1answer
55 views

Should I back-merge every day in a large project?

I work on a large project (C++, C#) in areas that can have a lot of churn. I'm in the habit of getting latest sources multiple times a day. Every now and then this results in an awful back-merge. ...
0
votes
1answer
21 views

Visual Studio Online CI Builds and Gated Check ins

I'm looking for a way to achieve something like this using VS online ... I have a lot of small solutions in the root of the repo that are structured a bit like ... Foo.sln "/Framework/xxx" "/...
1
vote
1answer
47 views

Should commit messages be explicit by themselves, without requiring a diff?

I have noticed that I recently wrote the following commit message: Since HTML changed, getting the index would always result in zero, since the element is now enclosed in a parent block. For ...
0
votes
0answers
21 views

File folder contents versioning system

I'm sort of inspired from Amazon S3 and looking forward to advise on building my own versioning system on the server using plain nodejs/javascript with files provided by the client. Would also ...
0
votes
1answer
23 views

How Do DB Version Control Systems Lack in Script Semantics When Modeled on Souce/Target Difference Comparisons

There are several database version control solutions out there to assist with controlling not only the versioning of a database, but also deploying and synchronizing databases. These systems are ...
0
votes
1answer
55 views

Editing a master document and not overwriting everything in individual “versions”?

Problem: How to edit a master copy of a document and push changes to a large (approx. 1000) number of individually personalized documents without overwriting all personal changes? Example: "...
3
votes
2answers
211 views

Types of version control systems

On the topic of Git; are there other types of version control systems? other than Local VCS, Centralized VCS and Distributed VCS stated in here?
0
votes
0answers
29 views

Automating the deployment of a web application to a shared host

I was not really sure in which SO community I should ask this question, so I am asking it here. I have a basic Angular web application, and I am ready to deploy. The app has no backend to deploy (I ...
5
votes
0answers
53 views

Mercurial: tracking several repositories with same versioning

I am using mercurial on my project. Now I face following problem: I have two separate mercurial repositories with their own history. Now I need to have identical branches/bookmarks for both of them. ...
0
votes
0answers
21 views

Best way to handle multiple environment specific sql scripts in source control

I am maintaining an app that uses a lot of sql server 2008r2 stored procs, views etc. The problem that I have is that certain stored procedures/views have code that is specific to the environment: ...
1
vote
0answers
18 views

Setup SVN repository with multiple applications and libaries while maintaining specific versioning per application

In our project team we have one SVN repository which holds multiple applications and libraries (all QT projects) /trunk/App_X/ /trunk/App_Y/ /trunk/App_Z/ /trunk/Lib_A/ /trunk/Lib_B/ /trunk/Lib_C/ ...
1
vote
1answer
53 views

How do I organize my project to accomodate GIT pull requests for source installed via PIP?

I want to structure my Python project in a manner such that others can use a package manager (PIP) to easily clone the environment for team development, and GIT to contribute to the project, plus a ...
2
votes
0answers
22 views

How to set up embedded projects for maintainability

We are about to start using FreeRTOS with lwip and mbed-tls as a platform for new products. We're working in an Linux environment and I'm tasked with setting up our first project. In Linux we ...
4
votes
1answer
117 views

Should the HEAD version of the trunk always build?

At my workplace we use CVS tags to the extent that nobody ever retrieves the HEAD version of the trunk. Is there any reason why that version still needs to build fully? The reason I ask is because ...
0
votes
0answers
51 views

Which git branches should I tag?

I read this nice post: Git branching and tagging best practices I really like the NVIE git branching model and I try to use something very similar: http://nvie.com/posts/a-successful-git-branching-...
5
votes
0answers
82 views

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

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
41 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
29 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 ...
20
votes
5answers
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
58 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 supporting-framework-we-plan-to-release-seperate-...
6
votes
1answer
216 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 ...
9
votes
2answers
147 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
113 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. ...
247
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
206 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
111 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
205 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 later....
3
votes
1answer
127 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
38 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
56 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
102 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
129 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
105 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 ...
23
votes
6answers
576 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 feature/...
3
votes
1answer
151 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
192 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
72 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
49 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
113 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
241 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
157 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
27 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
313 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
79 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
237 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
117 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): https://github....