Questions tagged [version-control]
A programming discipline for tracking, storing and retrieving revisions of source code.
0
votes
0answers
21 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 ...
6
votes
3answers
287 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 ...
2
votes
2answers
87 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, ...
0
votes
0answers
25 views
Using SVN, how do I selectively create a patch file? [migrated]
I have a codebase with several changes in it that are best split up into several commits.
In git, I would use git add -p to select the changes I wanted from each file and create a commit and pull ...
1
vote
1answer
40 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
293 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 ...
0
votes
1answer
47 views
What should I prefer: An SCM subrepository, 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
66 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:
...
-4
votes
1answer
57 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
66 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
138 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
82 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. ...
-1
votes
1answer
62 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
149 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
53 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
22 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 ...
0
votes
0answers
45 views
Should application-specific server configuration be stored with the application's source code?
Context:
We've shifted to Docker for local development and remote testing environments of different applications. Previously, each application was standalone so docker images were built and supplied ...
1
vote
3answers
127 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
39 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
100 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
106 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 ...
4
votes
2answers
153 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 ...
3
votes
2answers
118 views
Code quality on backports branch with limitted lifespan
JuliaLang just hit version 1.0 the other week
I and many other package maintainers have thus updated out packages to work with julia 0.7 (the transitional release) and 1.0.
In doing so, we've often ...
1
vote
3answers
128 views
How can mainline/trunkd development work when we have multiple versions in prod at the same time?
I am not a developer myself so please bear with me. We are providing solutions for various customers and it is common to have a situation like this:
Our customer has a version 1.1, and wants us to ...
1
vote
3answers
165 views
Should I commit every change before switching branches or is stashing the best option?
I am new to git and am currently trying to learn as much as I can about it.
I think the concept of it is fantastic and extremely valuable to any developer's workflow.
I am a data scientist who ...
5
votes
1answer
192 views
What is considered best practice around using git / VCS's when doing a complete code rewrite?
I am a data scientist who programs in R, but am relatively new to using version control (yes, I know!) and I am still learning lots about it.
FYI: I use BitBucket and Sourcetree
I understand the ...
1
vote
2answers
64 views
universally understood file-diff format
I've always assumed that the output from diff (typically "unified", whether or not it's colorized) is universally understood among most if not all text-based language programmers. Whether it's used ...
2
votes
2answers
1k views
Monorepo vs multi repo for large project with multiple partial deliveries
I am looking into options for smoothing out our deliver and release pipeline, and would appreciate some advice on the best way to structure the source code.
This is a pretty large project, which ...
3
votes
2answers
402 views
Do we really need a master branch or can we release straight from a release branch?
Currently we have the following branches:
Develop
Release 1
Release 2
etc..
Master
When we want to cut off new features for a release, we create a new release branch (say release 3). We then only ...
0
votes
0answers
38 views
With Source Control, when should one get the latest versions in the workflow? [duplicate]
In teams, when should one get the latest versions of the files in source control in an optimal workflow?
For example, should it be right before you commit? Or every morning? Should it be automated?
...
-2
votes
1answer
64 views
What does it mean that DVCSs allow us to set up several types of workflows that aren’t possible in centralized systems, such as hierarchical models?
Can someone please explain the last sentence of this paragraph about Distributed Version Control Systems:
"Furthermore, many of these systems deal pretty well with having several remote repositories ...
1
vote
4answers
383 views
Best practices for database backward compatibility
I am working on an app which has multiple versions deployed in the market. Different versions have modified databases and databases are to be synced between local storage and server storage by signed ...
0
votes
1answer
125 views
My team is working on the second version of software, but we are still in alpha. How should we version it?
So this is a little complicated. We are trying to follow semantic versioning (x.y.z) but we are having trouble agreeing with each other on what numbers we should start at.
We inherited a product, let'...
3
votes
4answers
264 views
Release branches and trunk versioning
We are using version in following format:
Major.Minor.Bugfix.Test
Development for upcoming release is going on in the trunk. When enough features are done we are creating a new release branch: 1.1,...
-3
votes
2answers
139 views
Source control with multiple customer-specific repositories
Here is a diagram of how our source control setup is configured.
The issue with this setup is how we handle various customers. I would really like to use a different approach than copying the entire ...
2
votes
2answers
637 views
Proving Two Zip file are identical
I migrated some files from one Version Control System to another. I have to prove that content are identical (between source and destination, denote 1 , 2). There are a few zips files (lets call them ...
-1
votes
3answers
289 views
How did scientists “source control” hardware switches?
I'm putting together a talk of the history of best practices in software development and we're trying to put together a bit of a timeline of how good practice has evolved.
This question talks about ...
3
votes
2answers
342 views
Should we assign version numbers for internal releases?
In our environment:
Internal releases are those which went through testing process. Builds either pass or fail.
External releases are those which are delivered to users.
For external releases, ...
3
votes
2answers
127 views
How to convert multiple Git repositories for related code into proper branches/tags
Background
I've recently become the technical lead/senior developer for a small R&D/data science team. I've got a decent amount of non-lead experience in bigger development teams, but I've not ...
0
votes
0answers
98 views
Should we be using same branch for testing AND deployment in a parallel multi feature development enviroment?
Within the development area, often for a given project, more than one developer is working in "his own" new feature on a separate branch (We use GIT for version control). Besides these feature ...
0
votes
0answers
41 views
Document version control when using a template
When working with documents related to your project, one often has a version history table on the first or second page. Something like this:
0.1 Draft creation
0.2 Added X information
0.3 Added Y ...
8
votes
7answers
401 views
How should “useful throwaway” scripts be handled?
You know how it goes: there is some small repetitive task for which you found a way to quickly automate 95% of the work. You create a script, run it, manually fix the output, and you're done. Of ...
1
vote
0answers
17 views
How can I make sure a branch gets duplicated in my development and main branches in TFVC?
I inherited a Visual Studio solution with a Main branch, a QA branch off of Main, and a DEV branch off of QA. It seems these are the only branches and they've existed for the lifespan of the solution. ...
0
votes
2answers
191 views
Version control locally on Android
I am trying to make some version control locally on my Android project. It is just to have control about my changes, but I do not want to upload them to any external repository. Neither I want to ...
1
vote
2answers
151 views
Should checkins into the Master Branch be clean?
We had a debate on our team about how clean the Master branch should be.
The application is written and maintained by two people, me (a developer) and a GUI/UX designer. The GUI/UX designer does a ...
-3
votes
1answer
136 views
What is structure of versioning process?
How should be represents process of versioning in developer team? Suppose that we have CI system, and we want start versioning our software.
If we speak about semver, then major and minor version ...
15
votes
3answers
1k views
Why would you not commit merged changes immediately?
My office uses Git and SourceTree for our version control. This came about because when I joined there was zero version control and SourceTree was the only system I had ever used. I am not an expert ...
116
votes
5answers
16k views
What are the advantages of using branching as a solo developer?
First off, I am aware that many questions have been asked about VCS as a solo developer, but they are often too broad. This concerns only branching, and still it has been marked as a duplicate...the ...
0
votes
1answer
412 views
Two code bases in one repository… is there ever a good reason to do this?
I work on two code bases that are related, but independent. One is written in PHP, the other is Node JS. Currently, they are in a single repository. The repo is deployed to Heroku for the Node code, ...
-4
votes
2answers
167 views
How can I control my versioning (perhaps with GIT), such that when I update a function (such as add an argument) it won't break the rest of the code?
I'm just working on a set of MATLAB files right now that I'm using for my thesis. I want to be better organized and figure out the best way to keep track of changes. I have read that GIT is a good ...
