Questions tagged [scm]
the tag **SCM** is used for topics concerning source control management, if the concrete SCM tool isn't important.
29 questions
-1
votes
1
answer
83
views
How to maintaine a local git fork from a repo with many branches
I'm using a public git repository and adjusting it to my specific needs, meaning that the changes are not worthy of being merged upstream.
Repo is in github (upstream), and we maintain our own git ...
- 123
1
vote
2
answers
404
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,...
- 327
29
votes
7
answers
10k
views
Is my company merging branches wrong?
I recently came across an MSDN article about branching and merging and SCM: Branching and Merging Primer - Chris Birmele.
In the article they say 'big bang merge' is a merging antipattern:
Big Bang ...
- 433
1
vote
1
answer
524
views
Sould i tag a hotfix release in production using GIT scm
We have weekly planned release cycle. Following standard semantic versioning system. Like first week V3.0.0, next V3.0.1 patch release, next week V3.1.0 minor release.
Apart from the above planned ...
- 11
3
votes
1
answer
217
views
Organizing Ad-Hoc Tooling in a Multi-Repo Structure
Imagine you have the following scenario. Your organization deploys some app core to its mission. For example if you're Stack Exchange, this might be the customer facing web server. Let's also say you ...
- 147
0
votes
2
answers
134
views
Do Scala worksheet (or REPL logs) belong to the SCM?
The Eclipse Scala IDE (and Intellij Idea, too) has, together with a standard REPL CLI, an artifact named Worksheet, that works like a persistent REPL log: the whole file is compiled and executed at ...
112
votes
14
answers
19k
views
How can I maintain code quality without SCM?
I am working in a governmental institution. The technology being used here and the methods for developing software are quite old fashioned.
They have tons of storage space but no appropriate space ...
- 1,011
4
votes
2
answers
7k
views
How I can organise a project in more programming languages in Git repos? [closed]
At work I'm using Java, but I'm planning to study some other programming languages as Python or Clojure.
I'm thinking of coding one project in Java in my Git repository and, during my study, coding ...
- 341
0
votes
1
answer
77
views
Where to place Thrift generated code
I am working on a project that is using Thrift and as a result has auto generated code.
Firstly, what are the pros and cons of placing this generated code in SCM vs not and insisting developers ...
- 483
12
votes
6
answers
5k
views
In git, how to do versioning for a dozen libraries all worked at in parallel
We are doing projects, but we reuse a lot of code between the projects and have lots of libraries that contain our common code. As we implement new projects we find more ways to factor out common code ...
- 10.1k
5
votes
1
answer
2k
views
How can I split a repository that contains many projects which share the same build system?
I've been working on the past years on a research compiler suite, which builds several executables and libraries. It has a build system (namely bootstrapper) that looks into the ./src/bin directory ...
- 173
5
votes
1
answer
334
views
What is the maximum number of steps to find a bug using bisecting?
Assume that a node A in the commit tree of a codebase contains a bug but some ancestor B of A is clean from that very bug. Given the topology of the commit tree [B,A] leading from B to A, can we ...
- 2,075
3
votes
2
answers
4k
views
One commit in two branches: what happened?
I work on a project using maven and svn.
Today after a svn update, the maven build was failing on the svn trunk. When I looked in the svn logs, I saw something strange: a commit affecting two ...
- 133
7
votes
3
answers
5k
views
Is it good to split big repository into smaller ones to have separate history/issue etc or keep it big? [duplicate]
We are currently porting our huge svn repo to git and we are thinking to export subdirectories of repository, each one containing source code of independent binaries, documentation or robot tests, ...
- 1,279
1
vote
1
answer
151
views
How to avoid old commits/PRs that are painful to merge?
We have a pretty good code review process, but there are couple of issues. The most annoying problem is merging. From time to time the number of stuff to merge grows rapidly and some of the commits ...
- 1,496