Questions tagged [version-control]
A programming discipline for tracking, storing and retrieving revisions of source code.
953
questions
2
votes
0
answers
84
views
Is the difference between "changesets" and "snapshots" in version control primarily a space-time tradeoff?
There are many version control systems out there, and they tend to use one of the following models to store separate versions of a repository:
Snapshots - each version of your repository is stored in ...
- 328
3
votes
1
answer
168
views
I need help understanding a seemingly broken Git release flow
First some context. Working in teams which use a CI environment, many people will know the typical Gitflow release process.
Without going into too much political detail, the company I currently work ...
- 53
3
votes
2
answers
309
views
Is it logically possible to consistently name commits in a VCS using an ordered sequence?
Imagine you're creating a completely new version control system, like Git, Mercurial, SVN etc. from scratch. Rather than identifying commits by SHA hashes, you identify them using an ordered sequence ...
- 328
0
votes
2
answers
78
views
Version control for modification of a part of another project used in my project
There is somebody else's project (A), a part of which (foo.h) I want to use in my project (B) with some modifications. The modifications make sense only in the context of B, so I can copy foo.h into B ...
3
votes
2
answers
242
views
How to keep attribution in version control (git) when one author moves another author's code?
Sometimes code will need to be moved. A common example is some logic that exists in a controller needs to get moved to a helper class so it can be called from outside of that controller. So someone ...
- 181
2
votes
0
answers
228
views
Better alternative for cherry picking across heavily diverged branches
I'm currently trying to update the linux kernel used in a xilinx SoC, my company has an internal repo/fork of xilinx open source linux with a bunch of kernel drivers for our custom hardware & ...
- 29
0
votes
3
answers
118
views
Merging Python2.7 code to its ported Python3.9 version
I am working on a Django based project that is version controlled with SVN. My main objective is porting it from Python2.7 to Python3.9. Whilst I port the project, my team brought some updates, now I ...
-3
votes
1
answer
67
views
Applying a file diff to a new file [closed]
Suppose I have file a.txt, b.txt and c.txt:
a.txt:
Hello, I like cake.
b.txt:
Hello, I like turtles.
c.txt:
go away, I don't like you
I suspect the difference between a.txt and b.txt is ...
- 213
-2
votes
4
answers
298
views
How can I use git effectively when I'm just starting a project and working on many parts at once?
I've been having the problem that at the beginning of a new project, I'm likely to switch frequently between tasks in a way that (to me) doesn't seem very conducive to small single-concern commits. ...
2
votes
2
answers
309
views
Mixing server and client code in monorepo
To date, we have implemented a multi-repo approach in which each project, or for larger projects, each tier, has its own repo. Code is written in Typescript, Javascript, C#, PowerShell and T-SQL. ...
- 121
0
votes
2
answers
58
views
How to version modules that depend on different framework versions
I work as a Website developer. We use a framework for building the backend of our sites.
This framework recently released a new major version with lots of breaking changes. We have some sites using ...
- 111
2
votes
3
answers
515
views
With Kent Beck's "test && commit || revert" (TCR), do you skip the "red" of "red, green, refactor"?
If you haven't heard of Kent Beck's TCR, it can be summarized with this: any time your tests go green, you commit; anytime your tests go red, you git reset --hard.
This post is about how to practice ...
- 6,630
0
votes
2
answers
145
views
What is the current definition of continuous integration?
It seems that there are at least two possible definitions of continuous integration:
Frequent merging of a codebase to a common codebase (e.g. daily merge to the main branch of a VCS server).
...
- 570
-1
votes
2
answers
141
views
Proper ways to manage evolving inter-communicated microservices APIs?
I'm working on a big C# application that is currently under development so we have some room for structural refactoring.
The application is divided into 10 microservices, which some of them ...
- 147
7
votes
1
answer
281
views
How do you use version control systems while you are in a long design spike phase?
In some recent projects, I found myself having some longer spike phases in which I build many cheap prototypes and explore different design decisions, long before I would consider my code of ...
- 181
5
votes
6
answers
345
views
Is there any way of applying a code formatter to a active codebase that doesn't lead to suffering?
Often one wants to apply a code-formatter, like Black, or JuliaFormatter to a existing code-base.
One where standards have tried to be followed but a few things might have slipped in.
Once you have ...
5
votes
3
answers
433
views
Reasons behind conventions around what goes into source control?
I've come across some apparently-conflicting patterns of behaviour. I'd like to understand why they each exist. I'll call them "conventions" for the sake of simplicity, though I'm not sure ...
- 282
3
votes
3
answers
457
views
Is checking dependencies into source control worth the cost?
For the last several years, I've been checking all dependencies of my team's nodejs project into source control. At first, we stored the archives of all dependencies using yarn v1's offline mirror, ...
- 149
2
votes
1
answer
532
views
Strategies to organize multiple projects which may reference each other and managed by different teams in Git?
First actually I don't think Git is a specific involved tool here, it can be any other Source/Version Control tool (TFS, SVN, ...). The point here is how to deal with the scenario in which I have ...
- 149
0
votes
0
answers
97
views
How much should we archive for reproducible builds?
A few alternative twists on the question title to contextualize further:
What to archive of the "sources" for a given software build?
Should I include all transitive packages in my ...
- 7,323
0
votes
2
answers
294
views
Architecting project into multiple source control repositories
I'm doing some work with my team to refactor/rearchitect some parts of our existing codebase which consists of two separate Django apps hosted in one common project repository. We're starting work on ...
- 213
-1
votes
1
answer
94
views
Version control organization for large .NET solutions
I'm trying to come up with a better way to organize my C# projects on SVN. The .NET solution for my main GUI has about 28 class library projects. These libraries fall into two categories. Some of them ...
- 107
2
votes
4
answers
245
views
How can I keep track of which existing lines of code/text have passed some new review?
Firstly, this is a really tough topic to do searches for because you get a wealth of information on “code review”, which is different from what I’m referring to here. That normally refers to ...
- 241
1
vote
0
answers
152
views
Build & deploy individual apps from a monorepo
My Proposed Monorepo Architecture
This layout is what I've come up with from reading through tons of articles and being convinced that Nx suits many of our needs where I work. The layout works fine ...
- 111
8
votes
2
answers
843
views
Should Visual Studio specific files be excluded from version control?
I work on a number of code projects, some open source and some not. Many of these projects are intended to be cross-platform, most often running on either Linux (my natural habitat) or Windows and ...
- 194
2
votes
1
answer
512
views
How to setup our codebase for efficient code sharing and development?
Our situation
At first, our company had 1 product. Custom hardware with firmware we wrote ourselves.
Now more projects are starting to be added. Many can reuse most of the components of our first ...
- 95
5
votes
1
answer
618
views
Confused on Git workflow and role of dev environment/branch
I work in web development and the team I work on is growing so I see the need to hammer out a more formal Git workflow. We have a process down that is working for now but it's starting to cause more ...
- 167
0
votes
1
answer
84
views
Distribute commit files between different repositories
I am not sure if what I'm asking is even possible (or desirable, for that matter), but we were wondering what would be the best way to handle SQL changes to a Database schema, when this schema is ...
- 3
-2
votes
1
answer
81
views
Best Git branching strategy plan CI/CD for kafka platform development
I'm working on a Kafka platform development project, the team is keeping all the code in master with no branches, next moving to QA, Stg, Prod. If in between these stages if they don't need any ...
- 1
9
votes
2
answers
552
views
Disadvantages for having completely different codebases in different git branches
One senior member of my team setup a new git repository for our product we are working on, since we are migrating from SVN to git. Our product consists of different software components that are ...
- 111
50
votes
11
answers
9k
views
How can a developer overcome their fear of merge conflicts? [closed]
I'm a beginner at collaborative development, I started learning about merge conflicts.
And I have this question.
Is it possible for a developer to deliberately postpone merging because he doesn't want ...
- 511
-3
votes
1
answer
96
views
Reverting commits after merge
I am working on dev branch and I merged dev into master so all the commits not appear on master but I am not very confident about some thing. Should I do pull request and then merge or this way is ...
3
votes
2
answers
149
views
"Support branches" and major tech update
Our software product promises to support major releases with bug fixes for X years after the release, meaning that in our git repository, we keep permanent "support branches" for every major ...
- 141
-2
votes
1
answer
134
views
First time teamwork (PHP): version control and continuous integration?
A colleague and I are going to be working together on a single project for the first time. This raises a few technical questions for me. Like how.
I think a version control system is a must now, if it ...
- 29
-1
votes
1
answer
516
views
Is there a way to use git with multiple users on a shared computer?
I'm currently a user of a large research compute cluster which has many other users. We all have access to a shared program that is being actively developed and used. Since we are all effectively ...
- 27
0
votes
1
answer
152
views
Code review patterns for multiple teams working on a single product
We're scaling out development on a single product from a single team to multiple teams. What are the patterns to ensure coding style, patterns and technology is used consistently?
Is there one person ...
- 597
2
votes
2
answers
389
views
Who is the potential audience of a commit message?
I've been taking a course on plain language writing, in order to make my commit messages more readable and understandable.
One of the main ideas in plain language writing is that your first identify ...
- 472
0
votes
2
answers
923
views
What is the relationship between continuous integration and git hooks?
I'm trying to get into the habit of making sure that each master commit to a repository I work on does not break any existent tests. In my current flawed workflow, there are some intermediate commits ...
- 364
4
votes
2
answers
312
views
Proactive git branch conflict detection?
I'm considering creating a new tool, but I wanted to find out if something like it already exists.
tl;dr: Looking to make or employ a service which scans a SCM repository with the explicit goal of ...
- 499
1
vote
1
answer
595
views
Continuous Integration practices for forked repository
We have an on-premises BitBucket server with a git repo for an embedded device. We use a multi-branch pipeline in Jenkins to:
Build and run tests
Build the firmware (and a little supporting PC tool)
(...
3
votes
1
answer
193
views
Projects version and database compatibility
We are trying to fix our's company versioning of several modules and I'm not sure how to consider Database compatibility when versioning.
The same Database is used for a lot of applications and we're ...
- 141
-4
votes
1
answer
596
views
Best practice for organizing build products of dependencies and project code in your repo source tree?
I've checked quite a few related questions on source tree organization, but couldn't find the answer for my exact need:
How should I organize my source tree?
What's the best structure for a ...
- 95
0
votes
3
answers
524
views
Running multiple version of code
How should I set up my project when I want to run the present version of a class against previous versions? I'm interested in issues related to code organization, file naming, and source control.
I ...
- 39
0
votes
2
answers
211
views
How to deploy pipeline rerun?
I have an application that's mostly one large data pipeline. That pipeline runs daily and stores processed data in the database (it takes the execution date as its argument). Occasionally the client ...
- 17
26
votes
6
answers
6k
views
How to structure commits when unit test requires refactoring
I'm trying to get a review for my lists of pros/cons about how to structure commits that came out of a discussion at my work.
Here's the scenario:
I have to add feature X to a legacy code base
The ...
- 379
-1
votes
2
answers
189
views
Explaining why a code's modifier should also be its committer [closed]
The context of this question is the early stage of introducing a VCS into an academic setting consisting of non-SW-engineers, largely unaware of modern best practices related to coding as a team. At ...
- 233
0
votes
2
answers
128
views
How to Maintain Rarely Used Scripts
I come across the need to do a lot of one time scripts (related to API evaluations, data extraction, experiments etc.) that have the potential only to be used very rarely in the future. These could be ...
- 125
12
votes
2
answers
3k
views
Is cherry-picking commits into master (instead of merging) a good idea?
Background
At work we've been trying to find a new workflow. We currently follow git-flow pretty closely. We don't have release branches; we just merge develop directly into master once we feel like ...
- 1,016
1
vote
1
answer
67
views
TFS Branching for Xamarin Common Projects
I have a solution for Xamamrin.iOS and Xamarin.Android application with structure as below,
Solution Root
Common Project
Xamarin.iOS Project
Xamarin.Android Project
I need to branch both iOS and ...
- 359
2
votes
1
answer
347
views
How to review and merge a big feature
We are creating a new page on our website which will require overall ~5000 LOC.
Now the problems here are:
How to get so many lines reviewed?
When to merge these changes to master for release?
How ...
- 81