vcs | PHP interface for version control systems | Version Control System library

I'm currently working on a (laravel) project that should result in two versions, but I find myself constantly rebasing and merging my code. I guess it's my git workflow that is mistaken, but I need some heads up on what I'm doing wrong.

My macro-question is: Much like IntelliJ maintains dozens of IDEs that have almost the same basic functionalities but are built into different versions, is there some specific VCS tactic or best practices for doing so?

Say I have a project (one code base) that is for two clients A and B. A wants a blue theme and B wants a green one, so currently I just have them on two separate branches. These branches often have client-specific changes.

Now I have a new feature that I want to work on, which applies to both A and B. This is how I do it now:

1. Create branch new_feature_branch from main
2. Finish the code on new_feature_branch
3. Send PR and merge to main
4. Rebase client_a_branch and client_b_branch on main

This works fine on normal features, but when there is a minor bug (say, a typo) on the main branch, having to go over all these every time just so that the patched code could get to the client branches just seem kind of awkward and... unintuitive(?) to me.

I just want to make sure if this is how "multiple versions with same code-base" projects are handled generally? If not, how is it commonly done? (A simple link or keyword to what I should look into would be helpful enough)

I'm totally unaware of how things work in production, and I'm also not confident about my git knowledge, so sorry if this question seems naive or whatsoever.

Thanks in advance!

Trying to integrate a new TeamCity project with an existing git-bitbucket repo.

I am a rather limited user on our TeamCity platform (on-prem, 2017.1.3-46961). I do not have access to the actual server file system, I am using the web interface, instead.

Created an SSH key pair on my laptop with ssh-keygen -t rsa -m PEM

In our TeamCity, I uploaded the SSH key (private side):

However, when trying to set up my VCS root with that key, I cannot see it in the drop-down:

This VCS Root is in the project where the SSH key has been uploaded. Should have I uploaded the key somewhere else?

Or, maybe, this is a TeamCity bug? I tried basic shake-up like hard-refreshing the page, logging out/in...

When using a composer.json like this to install a private package:

I'm trying to build a bot that helps people stay focused when they want to study. My exam is coming up, and personally, I've been struggling with staying out of Voice Channels in my server. Is it possible to gain full control of a user's account, regardless of their ranking/authority in the server? Let's say I've been in a vc for too long and my time limit is up, I want my bot to have the authority to kick me out of vcs even though I'm like an admin or the owner of the server and my role as an admin is above that bot in said server. Would that be possible? To like give it an authority over my account or something like that? With permission from the user first of course.

I am just starting to learn GIT when I should have learned it a long time ago. I have been a web developer for 25 years and rarely work with teams. However, I am learning GIT but they don't answer all of my questions.

Hypothetical situation:

My remote master contains version 1 of a deployable program written in Python. I decide to create a branch to work on a new feature.

There is another developer working on a separate branch called "Bug Fix". I create a new branch called "New Feature" and start writing the code for it.

I have the following questions:

1. How would I go about testing the new feature before I merge it to the master branch?
2. What if the person who is working on the "Bug fix" merges with the master and their code prevents my new feature from working properly?
3. How does the other person working on the "Bug Fix" test their code with or without my "New Feature"?
4. How would this work. When I am finished writing my code, would I pull the master branch code down in order to test it at that point in time or what?

If someone could give me a hypothetical answer to this, it would really be helpful. I have never worked on a team and this is why I don't understand how it works.

Also, maybe you know of some resources where I can understand this more clearly?

I just don't understand the theoretical workflow of a VCS.

Thanks in advance, Matt

I have some code which does some editing and then filters. I then copy this data and paste to new sheet. Problem is, the rows can grow each time so i would like to make this dynamic.

Can anybody guide me here?

Here is my code which is working

I'm migrating a VCS to git. This is done by checking out from the old VCS (TFSVC) and checking into a git repository via scripts.

Essentially in such a loop:

Unable to load viewControllers. There is no initial selection in segmented controller

when my view loads I want my firstCVC be by default the first viewController

Here is my parent viewController

Keep a Changelog is a wide-used convention that brings some guidelines about the maintenance of a CHANGELOG.md file in repositories managed over a VCS.

I'm in doubt about how should it work when it comes of multiple commits of a unique release. Since its text describes that "The same types of changes should be grouped" and its own repo CHANGELOG.md file brings the following: