Stack Exchange Network

Stack Exchange network consists of 174 Q&A communities including Stack Overflow, the largest, most trusted online community for developers to learn, share their knowledge, and build their careers.

Visit Stack Exchange

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

1
vote
2answers
83 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
0answers
50 views

Getting changes from upstream, where changes are my own pull request without duplicating commits?

An example scenario follows: Keys: f = fork pr = pull request p = pull cb = checkout new branch m = merge a..d= commit ids Operators: & = duplicate commits (the first is squashed from ...
1
vote
1answer
29 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
19 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
40 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
112 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
35 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
96 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
103 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
114 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
116 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
123 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
162 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
184 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
60 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
561 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
293 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
63 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
268 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
123 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
169 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
123 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
471 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
286 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
195 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
125 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
84 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
37 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
385 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
161 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
130 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
348 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
164 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 ...
-1
votes
1answer
57 views

AngularJS-style commit type for a version bump

The AngularJS commit message format is a set of rules for how to your commit message should look. It has been adopted by AngularJS and other projects. According to these rules, a commit must be ...
0
votes
1answer
65 views

Should server IPs be stored in a repository?

Say, a gateway server keeps IPs to a main server and a database in a config file. This makes it easier to change the IPs without having to recompile. Does it really matter if this file gets committed? ...
7
votes
2answers
411 views

What advantages in source code control are there to a three-stage environment repository?

The current company I'm working for has what I consider to be an unusual set up for their version control system. I'm working with it but I can't help but feel what they are doing is suboptimal and ...
3
votes
1answer
190 views

Is a slowing pace of commits necessarily indicative of code debt?

I've noticed this correlation, but I'm not sure if it's just coincidence or if others have noticed this as well?
3
votes
3answers
245 views

How can I inform my team when components are ready for integration?

My team is developing a system with embedded and Windows components. Currently we have seperate repositories for the Windows and embedded platforms. The rest of the team have concerns that there is ...
1
vote
1answer
79 views

How to handle regional versions of a website

The site I'm building currently has three different regional versions (Australia, Germany, rest-of-world). These will be deployed to seperate urls. It's a static site, hosted on s3 using react. The ...
2
votes
3answers
125 views

Conflict resolution and merging order for the project code?

A team simultaneously made several refactorings (to raise system genericity) to the same project with some overlaps (yes, unfortunately, more like "big bang"). Code is spanning representation, ...
2
votes
1answer
334 views

When do I update the Git repo package.json/version release?

I am starting to get into versions/releases more now with Git and wanted to know if the structure I am doing now is correct. Right now, there is typically a few feature branches. A few commits from ...
1
vote
2answers
438 views

Strategy for version controlling database changes during development

I am redesigning a CRM tool, of sorts, from the ground up. We are creating the application and the database from scratch. In order for developers to stay out of each others' way, each developer has a ...
1
vote
3answers
315 views

Version control: Backup vs. publishing

The situation: Our team of developers and testers is transitioning from ClearCase to git, in some pioneering fashion. While experience with git is limited there is some familiarity with Linux, cygwin ...
3
votes
2answers
241 views

Version control of embedded OS system image

I'm working on a hardware product that contains an embedded Linux system. The majority of what we execute on that system is a set of Python code which currently has its own Git repository and is ...
0
votes
2answers
512 views

Is git squash a good practice for ordinary activity?

It's considered a good practice to commit to git a lot. Sometimes this is necessary where git is used as a delivery mechanism to test in the cloud. But my git history gets cluttered up with lots of ...