Questions tagged [version-control]

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

Filter by
Sorted by
Tagged with
1 vote
1 answer
157 views

"Nightly" a good place for experimental features?

In my day job I work on a tightly controlled project with features and overall scope ultimately decided on by committee. Often the final features are the result of a single (or multiple) member's ...
3 votes
5 answers
533 views

Is consequent and efficient refactoring enemy of code reviews in a legacy code context?

There are some Tech Leads that perform code reviews for each Git pull request. Apparently, a very good practice to be aware of the evolution of code. Basically, they expect to inspect a few lines of ...
  • 3,778
1 vote
1 answer
3k views

How do I write a message for a commit that resolves a merge conflict? [closed]

Say you commit, pull, have a conflict, resolve the conflict, and then commit. Since the local change already has a commit with a meaningful message and the remote change being pulled has its ...
  • 287
1 vote
2 answers
104 views

How can I reorganize others' code shared in source control repository, just for my own purpose?

When several persons work together on a project shared in repositories in github, it happens quite often that I feel that someone else's code is hard to read, and want to change and reorganize his ...
  • 5,301
2 votes
1 answer
234 views

If I have direct commit access, is there any reason to create a pull request for a small change requiring no feedback?

At my work, we use Git as our version control system. We have a master branch, which I have direct commit access to. Sometimes I have to make a trivial fix, such as fixing a typo in documentation, and ...
  • 2,618
18 votes
5 answers
936 views

How to do efficient code review during release fever?

The deadline for a release is tomorrow, your collegue finally finished his task that's crucial for this release, project manager is standing over your shoulder and presses you to finally make a build ...
  • 299
7 votes
2 answers
534 views

How to treat in-house libraries

I am facing problems structuring projects and libraries. In the company I am working for I often see, that things would be more maintainable and less error prone, if we could extract common code and ...
  • 187
0 votes
2 answers
175 views

Software package versioning confusion

I am working in embedded software domain and my primary work area is development of firmware for various MCUs. I follow the folder structure as mentioned below for any firmware project to release the ...
120 votes
7 answers
20k views

My office wants infinite branch merges as policy; what other options do we have?

My office is trying to figure out how we handle branch splits and merges, and we've run into a big problem. Our issue is with long-term sidebranches -- the kind where you've got a few people working ...
  • 1,310
7 votes
2 answers
622 views

Pros and cons of branching when fixing old code

Sometimes I discover that a commit I made two months ago had a bug. So I write a fix for the bug, but then I must choose one these ways of committing it: I can commit the fix directly onto the main ...
0 votes
2 answers
247 views

Migration from SVN to Git. Multiple depedant projects for Continous Integration

I'm in charge of switching our 10+ years old code base from SVN to Git. Currently we have one single monolithic repository containing all of our projects. We have shared libraries and multiple ...
  • 46
1 vote
3 answers
423 views

Git - Reason to forbid use of GUI Clients other than Git Bash\CMD

Is there any adequate reason for a manager to forbid the use of Git GUI Clients in a developer team. I was talking to a friend about - let's call Foo Git GUI Client - all the features and how i was ...
  • 1,411
0 votes
1 answer
111 views

Git repo strategy enterprise web applications customers also access server

Our organization currently has several web applications running on lamp servers. They are mostly static content, but also include php via codeigniter / laravel / vanilla php. Whenever we make changes ...
3 votes
3 answers
2k views

How to keep database user permissions under source control

I use liquibase for source control of our database. I put there changes to the schema, static data and procedures. So far I've kept permissions out of it; we have just four users with very well ...
  • 1,567
0 votes
1 answer
392 views

What is the proper way to track my build versions in Qt?

Basically what I need in my project is a number of some sort that iterates itself every time I build my project, and that I can output by my program. So for example, when generating audio, I need to ...
  • 3,389
3 votes
4 answers
1k views

When should code changes be checked into source control?

I've heard conflicting philosophies on this issue - or specifically, two conflicting philosophies. One is to check in the code as soon as the change is complete, so that your co-workers can see the ...
  • 1,502
5 votes
1 answer
357 views

Multiple git repositories with a common core lib

I have several git repositories for a web project that share a library of common code. I don't want to repeat the common code inside for each repo. What are some ways others have solved this problem? ...
4 votes
1 answer
720 views

What is the meaning of a metric for 'year-over-year commits' for a given project?

I have read this in many project description - like here or here. Looking for an explanation of what this means, I simply get more pages that discuss a project's "Y-O-Y commits". What does thie metric ...
6 votes
3 answers
3k views

Do we need a separated branch for fixing bugs raised during the testing phase?

Before release a new version of the software, which is a web application, my company creates a release branch. The QA team tests that branch and reports some issues. Should developers commit the ...
  • 663
1 vote
1 answer
1k views

How to organize Git for maintaining a code base used and modified in multiple projects?

I'm trying to figure out the best use of Git for my development team. We work on multiple C projects that share some common modules, each one varying a bit in each project. A module can be a hardware ...
  • 423
1 vote
1 answer
81 views

How to find out the source code of the earliest release/version?

Reading source code of the early release/version is very helpful for beginner to digest complex project. There is less line of code and learner can see the progression of the project. However, ...
0 votes
4 answers
4k views

Is Git more useful for versioning binary files compared to versioning text files? [closed]

I am currently studying some basics on git Version Control System on tortoiseGit for my project management so far i know that Git keeps track of the history of changes, and allows you to easily go ...
3 votes
1 answer
625 views

When adding a property to an interface in C#, is that consider major, minor, or patch using semantic versioning?

My team and I are trying to follow semantic versioning 2.0.0 to keep tabs on our library versions. We primarily use C# for our development and are currently in a situation where we are going to add a ...
  • 2,728
3 votes
1 answer
802 views

How should I reorganize an existing TFS source control repository?

My employer uses TFS VCS as more of a shared storage location for source code rather than source control with clear policies and branch owners to help organize things. I've been given a mandate to ...
  • 149
8 votes
8 answers
2k views

Should developers merge code across branches?

Currently we have 3 branches and trunk. If a developer makes a change in one branch, they alone are responsible from merging that change to the 3 other branches and eventually back to trunk. There's ...
  • 10.8k
27 votes
8 answers
8k views

Git - What issues arise from working directly on master?

I have seen lots of advice about git branching models and the most common opinion seems to be that making changes directly on the master branch is a bad idea. One of our co-workers is quite happy ...
  • 1,411
1 vote
1 answer
264 views

SVN - Branch merge process

We use SVN for our version control and have a trunk for minor changes and a branch for more significant changes and also for the devs to be able to work off the same code base. We regularly do trunk ...
2 votes
3 answers
193 views

Store Nuget\NPM packages in VCS with source or not?

Is it good practice to store Nuget or NPM (or other) packages in the source control with the source, or to keep them in some other place? My gut says they belong with the source, however a package ...
  • 724
3 votes
2 answers
2k views

Build on each commit - Continuous delivery

Just watched a video about continous delivery and there it was suggested to trigger a build and execute unit test on each commit. For our team of 10 developers and a build time of at least 10 minues I ...
  • 293
69 votes
8 answers
8k views

Should I record a bug that I discovered and patched?

I suppose that this is a common situation: I test some code, discover a bug, fix it and commit the bug-fix to the repository. Assuming that many people work on this project, should I first create a ...
  • 759
0 votes
2 answers
366 views

Source control utilizing single, remote development server, with "local repository" not on dev's machine

We have a small team currently working on numerous projects. We originally started out as a two person team and jumped in head first without any kind of source control. We currently break numerous ...
3 votes
2 answers
4k views

How to version when using trunk based development

I have been reading a bit more about trunk based development, my company currently mainly uses the git flow model, and I had a question regarding the commits that happen on the trunk and how they are ...
6 votes
3 answers
782 views

How soon can/should someone issue a pull request for a new branch?

Pull requests are a great feature of modern vcs hosting. They provide a consolidated view of everything that's happened within a branch's development, including a master diff of the composite change, ...
4 votes
1 answer
2k views

Maintain two different versions of similar code [duplicate]

I'm working on a special project where I need to create a new application with a similar but restricted functionality of an original application (basically a type of free application with limited ...
4 votes
1 answer
2k views

Is it good practice to check in updated assemblyinfo.cs files after build

Our build process changes the version number of all AssemlyInfo.cs files, so that the version number can be managed completely by the build server. Right now, we commit the changed AssemblyInfo.cs ...
  • 286
2 votes
3 answers
205 views

Do products of a build process belong in a repository?

For example: we don't put python compilation files (.pyc's) into the repo, probably because python generates them automatically. In a java house, do they commit the .jars to their repos? ...
  • 410
2 votes
1 answer
76 views

Is it appropriate to convert a project to a different language and keep the same versioning?

Say there's a package, foo. Foo is being developed primarily in Python, up until version 1.13.2. At that point in time, the primary developer decides that Go is much better suited to the task. He ...
  • 155
0 votes
2 answers
80 views

Commit messages in a multi-platform project

I have a project which supports multiple cpu architectures and multiple compiler toolchains. Some part of the code is the same for all architectures/compilers, but the other part is architecture- and/...
's user avatar
0 votes
1 answer
316 views

Automatic Resolution in SVN for CSV File

Situation We are a large team of developers, using SVN for source control on our project. One of our files, FileTracker.cvs, is very large: it contains metadata about almost every file in our repo. ...
2 votes
2 answers
209 views

How to improve version control on database structure when migrations take long?

I am working with a team of web developers. We are already using Git for version control of our code and it works well. However, while we are changing our code, it is also common to change the ...
  • 627
4 votes
2 answers
226 views

How to VCS a large-scale, “atomic” refactoring?

When migrating a project from one heavily-used library X to another library Y which is essentially equivalent but doesn't have the same API, it may be necessary to make a lot of changes. In the case I'...
7 votes
3 answers
711 views

Git philosophy: public vs. personal files: is there hybrid versioning?

I often find myself puzzled with such a questioning. I need to version my projects for two reasons: publish source code with its whole history so that people will be able to get into it, explore it ...
  • 183
2 votes
4 answers
2k views

Auto-merging from master to all branches -- good or bad idea?

A question has surfaced on the team: would it be a good or a bad idea to have a script auto merge from master to all this release's branches on a daily basis? I'm not entirely convinced by it -- it ...
1 vote
2 answers
2k views

How to manage multiple projects in a Git Monorepo

I am thinking about putting some files into a larger git respository but I have a feeling that git isn't going to be suitable. This is what I would put into the repo: Various scripts on servers. ...
  • 131
26 votes
5 answers
11k views

Why use pull requests instead of merging

What is the advantage of using pull requests instead of simply merging a branch into master without one? Particularly on a team where all developers have full access to master.
  • 1,828
14 votes
2 answers
5k views

Should minified CSS be stored in Git?

I use Gulp to generate minified CSS from my SASS code for a project I'm working on. I wondered whether it's considered best practice to regenerate this minified CSS when pushing live from Git... or ...
3 votes
1 answer
809 views

How can I use local Git with VSS

My employer still uses VisualSourceSafe6. Everything is checked-in into the main project directory in VSS. They are not using branching in VSS. Check-in's are supposed to be ready for release to QA ...
5 votes
2 answers
576 views

Is it important to have a consistent commit message style on a team?

On my team of 5 coders, we've traditionally adhered to a common git commit message standard stating (only) two rules: commit messages should include the why rather than just the what and they should ...
-3 votes
1 answer
185 views

Version control problem

I heavily use Excel and CSV at my workplace. File 0 Excel File The initial file is an Excel file. Let's call this File 0. This may or may not change with time depending upon the requirement of the ...
4 votes
1 answer
185 views

How bad of an idea is it to alter a file in a pre- or post-commit hook?

My team is using SVN to store a lot more than just source code - we are storing all kinds of files. A process I'm working on designing is used to generate diff reports whenever a certain Excel ...
  • 203

1
3 4
5
6 7
20