Questions tagged [version-control]

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

Filter by
Sorted by
Tagged with
0
votes
0answers
54 views

Gerrit: Working around the “single-change:single-commit” principle. Need Feedback

I have been using Gerrit in my work environment and I find it really amazing and powerful because of its elegant use of git's branching features to create virtual branches for code reviews (the "refs/...
-1
votes
0answers
21 views

How to go about combining separate codebases [closed]

I joined a company and essentially am taking over the project entirely. However, they (a third party company) built our codebase. The codebase is split into two, a Javascript frontend that connects to ...
1
vote
1answer
26 views

How to categorize configuration changes in semantic commit messages

I am trying to switch to semantic commit messages for project. While the idea is good, sometimes I find it is difficult to properly categorize changes like a configuration value change. If I commit a ...
0
votes
1answer
143 views

What is an interim version in Source Control?

I've been working on an open source project recently and have been checking out Core Infrastructure's best practices checklist. One of the items pertaining the "Change Control" checklist is as ...
0
votes
1answer
138 views

Any advice for Git workflow using branch per development team (and not per feature)

In our project, we have 5 teams working on a monolithic application in 3-week sprints. Until now, all commits go into master (via Gerrit). Our test pipeline is too lengthy to ensure quality pre-commit,...
2
votes
4answers
223 views

Should opportunistic refactoring happen in a different branch to functional changes

I'm not talking about the usual refactoring of new code you do as part of a development. This is more Boy Scout Principle type changes. While I understand why they're all made in the same branch, it ...
4
votes
3answers
227 views

What's the best approach when you need to work off two branches that still have pending PR requests?

Let's say I have branch-1 (branched off master (major update)) and branch-2 (also branched off master (minor update)). What is the best approach to do when I need to create another branch, e.g. ...
1
vote
2answers
140 views

How to approach long-lived feature code reviews in trunk based development?

My understanding is that trunk based development should rely on direct commits to master or short-lived feature branches that are merged with master. Incomplete work can be placed inside functions ...
-2
votes
1answer
96 views

Managing release branches in Git

When learning Git for the first time, I posted Git branching and tagging best practices. I learned a lot from this and have adapted git flow patterns to my personal projects since then. I am now in ...
1
vote
1answer
89 views

Using semantic version with trunk based development for Python package

I am trying to understand trunk based development with semantic versioning for a Python project. Has anyone had any experience of adopting a trunk based development with semantic versioning for ...
2
votes
3answers
274 views

How to manage a global source code style change?

We have a large Git repo. The files are a mix of styles: tabs vs spaces, unix vs windows line ending, JSON formatting styles, etc. We'd like to change every file to be consistent. However, if I ...
2
votes
1answer
51 views

How to version control a fragmented codebase until it is properly merged?

My team has a mix of software developers and scientists, and version control has been messy in the past. We're trying to do better, which leads me to ask this question. We have a central codebase for ...
2
votes
1answer
100 views

How to manage same source code for different country in SVN?

as per my current requirement. I would like to maintain common source code for different country releases. Below are the cases which are required to be covered in the new process of code manage. ...
1
vote
1answer
102 views

How do you manage development-only files in your source control? [duplicate]

When merging development code into the production code, what is the preferred method for handling items that should not be in the production code branch? For example, I have configuration scripts that ...
1
vote
3answers
212 views

What is a good method/practice I can employ to keep identical code snippits in two places in sync? Also, help documenting functionals

If I could get some input on the design of this, I would be grateful as well. Note that I'm programming in python. There's a function F that takes lots of data, runs some analysis on it (taking ...
4
votes
5answers
251 views

Git branches: Merging issues while having multiple release branches

We have to support multiple releases, so we are following git branching model similar to the above diagram. Now the problem is that we have to do lots of merging here example for fix/011, we are ...
3
votes
5answers
406 views

Versioning: Where exactly in the code or repository should I write the version number?

Right now I'm doing this: Update the readme to include the new version number and what it does. Commit the version number in git commit message (i.e git commit -m "1.2.1: this does that"). Push the ...
0
votes
3answers
305 views

Protect Part of the Code

My company works with different developers from different studios, always sharing the code to everyone aboard. At the moment, we need to protect a part of the code, not from theft but from some ...
-1
votes
1answer
115 views

Best practice - Single or Multiple source code repository

As mentioned here: The main aim of CI is to prevent integration problems, referred to as "integration hell" Our project is a 3-tier web application, with frontend(Angular 6), backend(Springboot) &...
0
votes
0answers
27 views

Code base architecture for one app that has multiple versions with small changes [duplicate]

I'm building a hybrid mobile app that has slightly different versions but share 99.9% of the code. There is a paid and free version, which differ in one function only. Also there is a slight ...
4
votes
2answers
190 views

How do I merge branches between Develop - Test and Production without moving across 'test' specific code?

I have a web application that has some specific differences between production and test environments. I.e. test email config, test payment config, the word Test written on the home page (useful to be ...
-1
votes
1answer
73 views

How to use Semantic Versioning on Existing Multi Component Codebase?

I am working on a multi contributor project, having ~2500 Commits. It has multiple components, i.e. Frontend, Backend and Data Processor/DB Ingestion. Now that we are expecting more contributors, a ...
1
vote
2answers
206 views

Are CCQ (Continuous Code Quality) tools like SonarQube expected to deny version control changes? [closed]

I am getting into SonarQube and everything looks quite and simple so far, but I am not sure what is the final purpose of CCQ overall. Yes it gives you a lot of tips about whats going on inside your ...
2
votes
1answer
44 views

Where to keep Ansible Inventory file

I keep my Ansible based deployment module in the same repository/directory as my application code. I use Mercurial for my VCS. The inventories file is ephemeral as the IP's of the cloud hosts keep on ...
2
votes
1answer
200 views

How do I work on a new project and simultaneously add generic code to a base library with version control?

I work on several projects and sometimes they share a common base. How do you work with version control? Here's an example: I've got a boilerplate Wordpress plugin that I reuse. On each new ...
0
votes
1answer
165 views

What are branching strategy pros and cons for 2 main types

So at a high level, we have multiple projects/solutions in company and we need to keep them in 1 source control. Since the number of projects is around 50, we are not creating individual repositories ...
0
votes
0answers
28 views

Source control Sql Server multiple shards with minimal differences

One of the database systems I work with (I'll call it database A) was essentially sharded into 3 schema-identical copies. This was easy to source control, and when a change was made to any of the ...
0
votes
1answer
84 views

Source Control Release Management: Simultaneous Releases with Different Configurations

This is a best practices question for release management of an app. But this scenario is a bit different than what I've been able to find myself. Essentially my company maintains a fork of its own ...
2
votes
1answer
196 views

Bringing a large, complex legacy project under git control

I'm a newbie with respect to git, but not to version control in general — I've been using CVS and Subversion for years. I've read both the Progit and O'Reilly (Version Control with Git) books, ...
1
vote
4answers
454 views

What are the risks of having a release branch?

Currently we manage our source code in a Microsoft Team Foundation Server project. We have the following branches: Development Feature 1 Feature 2 Etc. Test The process is that development is ...
0
votes
2answers
79 views

SVN / Git How to administer branches

I'm the technical lead for a small company (6 developers). We currently use SVN and we're slowly porting over to Git, after everyone gets their training. Currently our clients are the ones who "pull ...
8
votes
3answers
474 views

Keeping secrets out of source control - are we just moving the problem?

I inherited some projects in which secrets were in source control in App.config and similar files. Fortunately it's not a public repository so the risk isn't as serious as it could have been. I'm ...
3
votes
3answers
148 views

Git workflow regarding remote feature branches

I've been using git for a while, but still do not understand how to deal with feature branches. When you develop in a feature branch in a strictly local manner everything makes sense. You commit, ...
1
vote
1answer
55 views

Versioning hardware vendor SDK with git

We have n C projects which reference 4 different versions of a device SDK - 12.3, 13.1, 15.0, and 15.2. There is no public upstream repo for the SDK - it is released as a zip file. We need to patch ...
5
votes
2answers
300 views

How to maintain a low dependency version of a project?

I am not as technically skilled as most people asking here. I use git to backup my own work to an online repository, but I rarely use it in collaboration, and don't know much more than the basic ...
4
votes
1answer
126 views

Which should I prefer: A subrepository/submodule, or a CMake ExternalProject?

I'm developing or maintaining a free software project Foo which uses CMake for a build system, as well as source control (e.g. Mercurial or Git), with the repository being available online. Now, this ...
1
vote
1answer
82 views

How to version control common libraries? [duplicate]

For example, I have multiple projects which shares some common libraries: ProjectA CommonLib1 CommonLib2 ProjectB CommonLib1 CommonLib2 At the moment, they are all in one big repository: ...
-5
votes
1answer
61 views

Save settings per developer in Git

Persistence is an essential requirement for preferences. Developer's preferences are saved in .idea/ folder. It is recommended to add .idea/ to .gitignore to avoid merge conflicts. But then settings ...
0
votes
1answer
73 views

How to implement tracking of changes in text documents à la MS-Word/Apple Pages

I want to implement tracking of changes in plain-text documents, in a way similar to how it works in MS Word or Apple Pages. What I am unsure of is the data model and how to store it. Goal The ...
2
votes
2answers
162 views

Is it good practice to switch back to an old branch to develop a new feature or to create a new branch?

I have an old branch (old-branch) which I last used approximately four months ago that I used to develop a feature for a specific project. It was never merged back into master because the feature ...
1
vote
1answer
113 views

Reusing binary assets using Git

We have multiple projects that are using common binary assets (e.g. images, sounds, 3D models etc.) stored in a folder on a server. Right now, each project adds these assets to their git repository. ...
0
votes
1answer
107 views

One person controls only one folder, in a repository

How can I give complete control of one folder to one person, while the rest is in the control of another person. Control means they have the power to approve pull requests and commit to master and ...
1
vote
2answers
184 views

Storing config in source control, but a different version for each developer

We have a developer toolchain, governed by a config file. Each developer can have their own version of the config file. What is a good way to store separate versions of that config for each developer ...
0
votes
1answer
65 views

Process for archiving binaries from different repos using Git?

Working in the embedded systems space, our products usually require multiple binaries for each of the microcontrollers within a single product. Using SVN previously, we would bundle validation and ...
1
vote
0answers
25 views

Manage web service with different version

My vendor can log in to a master management system (System A) which manage multiple subscriptions of a SaaS (System B). Each System B is hosted separately on an isolated server. System A and system B ...
1
vote
3answers
186 views

Git one repo dependent on another

I have a git repository that is built with one library and during compiling the library is switched for another to get 2 versions of compiled code for 2 different libraries. (different versions of the ...
1
vote
0answers
56 views

2 way synchronization with multiple client version

I have a project consisting of both a local and a remote system. The database between the local and remote system needs to perform 2 way syncing. I know this can be achieved by using a 2-way syncing ...
-1
votes
1answer
105 views

Looking for a good git workflow for new projects with a small team

I work in a small team of developers (there are 3 of us). in the research that I have done, the workflow that most teams seem to follow seems to be as follows a branch is created for a feature and ...
1
vote
1answer
111 views

Multiple git users

On GitHub if I want to contribute to another user's repo I clone it, make changes and submit a PR, at which point the owner can choose to merge or not. I am trying to figure out how to create a ...
3
votes
2answers
160 views

How could a test engineer aid test-driven-development in continuous integration?

In an environment where you can't merge code that fails tests you obviously can't merge new, failing tests. But how to deal with a newly found bug exploit, meaning you wrote a new test exposing an ...