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
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
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
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
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
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
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
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