Questions tagged [version-control]

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

Filter by
Sorted by
Tagged with
47
votes
11answers
8k views

Do developers fear 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 ...
-3
votes
1answer
90 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
2answers
132 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 ...
-2
votes
1answer
123 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 ...
-1
votes
1answer
62 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 ...
-1
votes
1answer
47 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 ...
2
votes
2answers
372 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 ...
0
votes
2answers
112 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 ...
2
votes
2answers
139 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. The Pain: Working with many collaborators on a monorepo, conflicts are not possible to detect until ...
1
vote
1answer
69 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
1answer
143 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 ...
-4
votes
1answer
43 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 ...
0
votes
0answers
29 views

How do I map commits from a DVCS to the actual version numbers? [duplicate]

When using a centralized version control system such as SVN, where every commit acquires an auto-incremented number, it is relatively easy to track what version is released to production by simply ...
-1
votes
2answers
127 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 ...
1
vote
2answers
92 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 ...
25
votes
6answers
5k 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 ...
-1
votes
2answers
175 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 ...
-1
votes
2answers
83 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 ...
10
votes
2answers
455 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
vote
1answer
28 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 ...
2
votes
1answer
129 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 ...
38
votes
6answers
9k views

Whose responsibility is it to fix merge conflicts?

Say that A is working on a branch based off master and B merges changes into the master branch, which introduces merge conflicts between A's branch and master. Whose responsibility is it to fix merge ...
1
vote
1answer
69 views

Should we keep very similar files with slight feature differences under different names?

In my team, we use git branching to keep different features separate (of course). However, one co-worker insists on keeping these features in different files as well to avoid merge conflicts. For ...
10
votes
1answer
847 views

What causes the “git rainbow”?

Sometimes when working with other developers with git version control I run into a problem where the git graph suddenly spawns countless parallels lines like in this image. Image from here. I have ...
-2
votes
3answers
150 views

What is the best GIT workflow with CI/CD with submodules in a master to a test environment and a stable branch to a production environment?

We have a several GIT repos in Azure DevOps with .NET Core web applications that are related to each other with the use of submodule (we used autocreation of NuGet Packages in a private NuGet store, ...
58
votes
8answers
9k views

Do seasoned developers still have to deal with merge conflicts?

I am still a software engineer in training, but I have heard the following adage multiple times: Good coders don't have to deal with merge conflicts. Whenever I work on a project with others, I'm ...
0
votes
1answer
29 views

API Request/Response Model for showing differences in JSON objects

I am writing an API to merge two different JSON Objects. Both of these objects can have same as well different number of properties. Object 1 : { "name": "Sam", "lastName": "Hanks", "...
11
votes
2answers
409 views

Is it bad to have many contributors in a code repository?

Is it a bad thing to have a large number of contributors in a code repository? My current company has a really large repo. This repo has over 40 contributors. And there's a debate about whether or ...
1
vote
2answers
292 views

GIT: Why use master (or any branch) as to reflect what's in production

We're having a debate here on our server development team, and I'm struggling. I've always used master as source of record for production, with the master branch (or some designated release branch) ...
-1
votes
1answer
286 views

In GitFlow, why not merge from master to feature?

It seems to me that the sooner a developer merges with released code, the better. In the original GitFlow article this isn't done. The original picture is this: When long lived feature branch on ...
0
votes
3answers
97 views

Private and Public version of repository with minor difference

I am developing an application that has some features which are only meant to be available to members of the company while the majority of the application is for public use. Having two separate ...
0
votes
1answer
272 views

Why Git won't easily enable programs to output their version (commit hash)

If I understand correctly there is no built-in functionality in Git to simply let the program output which version or which commit hash string it is when it is run. Why not? Would it not be a simple ...
-3
votes
1answer
60 views

Git base code to be shared to multiple branches

I have a code that is reused for multiple projects. I'm having hard time to maintain across all branches. What's the strategy to maintain all of my branches? Say if I have a base code in one branch, ...
1
vote
1answer
292 views

What are the possibilities to embed GIT into application in order to manage version control of the projects that were created by that application?

I am developing an C++ application, which creates tree like structures (collections) of strings. I want to add the ability to save the information of these tree structures remotely/locally (can be ...
-4
votes
1answer
132 views

Ways of managing multiple versions of software

I'm writing an IDE that will support many languages. I'd like to have a separate "version" of the IDE for each language, to avoid having a confusing number of seemingly unrelated features. I'd also ...
3
votes
3answers
114 views

How do I review a Git merge that had some manual conflict resolution?

I have two feature branches that were recently merged, and I'm trying to examine the diffs as an informal code review after-the-fact. feature1 with about 50 commits was merged into master and a merge ...
1
vote
2answers
167 views

Should i accept that a client adds changes to sourcecode on an ongoing development?

I'm currently in a situation (i'm a technical lead) where the client has modified on his own the source code, and i'm being told to accept the changes and keep working on that version. Technically he ...
-1
votes
2answers
454 views

Are pre-commit or pre-push hooks that run lint and unit test scripts worth it? [closed]

I guess the argument for pre-commit hooks that lint and run unit tests would be that every single commit is clean. The argument against them is that they take a lot of time to run, which can add up ...
0
votes
1answer
79 views

How to manage breaking updates in an API & database

So I have been working on my mobile app for a while and it is live and in production. Because we released the app prematurely and are continuously improving current features and making them more ...
1
vote
2answers
149 views

How to prevent overwriting changes in TFS version control by another team member

Background: I'm asking this question as a UI test engineer. We have a small software team using TFVC on a TFS repository. We use the mantis bug tracking system to follow up on issues. Here's the ...
1
vote
2answers
104 views

Managing the same files in four separate SVN repositories

We have four repositories in SVN, in which most of the files are same in all four of them. The reason why we are using four different repositories is, we have four different software products which ...
2
votes
1answer
395 views

Request changes to a commit message during code review on GitHub

I am trying to teach good engineering practices to my team, and in particular, walking them through the basics of PRs and code reviews on GitHub. One of my team members has sent me a request to review ...
41
votes
5answers
10k views

Is it better to merge “often” or only after completion do a big merge of feature branches?

Say multiple branches are being developed, A and B, as well as a incremental "bug fix" branch C. Now C is already "finished" and merged into master. A and B are still in development and will not be ...
2
votes
0answers
235 views

Gerrit: Working around the “single-change:single-commit” principle. Need Feedback

I have been using Gerrit in my work environment and I find it really amazing and powerful because of its elegant use of git's branching features to create virtual branches for code reviews (the "refs/...
1
vote
1answer
128 views

How to categorize configuration changes in semantic commit messages

I am trying to switch to semantic commit messages for project. While the idea is good, sometimes I find it is difficult to properly categorize changes like a configuration value change. If I commit a ...
0
votes
1answer
214 views

What is an interim version in Source Control?

I've been working on an open source project recently and have been checking out Core Infrastructure's best practices checklist. One of the items pertaining the "Change Control" checklist is as ...
0
votes
1answer
166 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,...
4
votes
5answers
286 views

Should opportunistic refactoring happen in a different branch to functional changes

I'm not talking about the usual refactoring of new code you do as part of a development. This is more Boy Scout Principle type changes. While I understand why they're all made in the same branch, it ...
4
votes
3answers
252 views

What's the best approach when you need to work off two branches that still have pending PR requests?

Let's say I have branch-1 (branched off master (major update)) and branch-2 (also branched off master (minor update)). What is the best approach to do when I need to create another branch, e.g. ...
3
votes
2answers
609 views

How to approach long-lived feature code reviews in trunk based development?

My understanding is that trunk based development should rely on direct commits to master or short-lived feature branches that are merged with master. Incomplete work can be placed inside functions ...

1
2 3 4 5
19