All Questions
Tagged with version-control branch
568
questions
-1
votes
0
answers
11
views
How many codelines can be defined in this system?
I have a question about codelines and baselines as I'm struggling to understand everything. I just want to know how many possible codelines exists for this system and what are they?
system version ...
1
vote
0
answers
34
views
git diff a file against the multiple files it was split into
I have a file A on branch old_branch that exists as multiple files A, B, C on a different branch new_branch. I need to merge old_branch into new_branch which would require me to resolve the merge ...
- 56
0
votes
1
answer
26
views
Configure git to automatically track _specific_ (different) remote branch when creating branch locally
Imagine I have a repo with two branches A and B. I clone it:
$ git clone [email protected]:group/project.git
$ cd project
I checkout A:
$ git checkout A
Branch 'A' set up to track remote branch 'A' from ...
- 4,088
0
votes
1
answer
229
views
Changes Tab In Source Control Not Showing After New Branch Was Created In VS Code
Disclaimer: I haven't done any coding since 2019 and am starting again, so I'm rusty.
After creating a new branch and adding code to the new branch, the changes tab does not appear, only Publish ...
0
votes
0
answers
53
views
Git how to find out what is current tag for specific branch
Let's say we have 100 commits and it includes 10 branches and 5 tags.
Every tag describes some kind of history of these 100 commits (shortly release).
Question is how we can get list of tags or just ...
- 1,253
0
votes
1
answer
75
views
Temporarily switch to a different commit, commit again and go back to original commit
I have a branch called develop in which I am at commit c08e2887. I have to go back to an old commit 6a73b96e, make some changes to that old commit, commit again (let's call it abc) and push it to my ...
- 963
0
votes
1
answer
201
views
In Git, How do I checkout to a New Branch from an already Existing Branch?
I am a Ruby on Rails programming novice and new to VCS as well. I will explain my question with an example:
Scenario: I have created an rails application base using rails new AppName. An empty git ...
0
votes
0
answers
39
views
Git stash created strange branch
i'm new to theese semi-advanced concepts about git.
I was working on branch "mobile_perwanger" and wanted to switch back to "main" without committing the changes; so i stashed them ...
0
votes
1
answer
540
views
GitHub: create a branch off an older version of main branch
I currently work for a company that has a main branch, development branch, and individual task branches (see link)
Our Branches Workflow.
Changes were recently made to the main branch which caused a ...
1
vote
1
answer
123
views
find point where two branches in git FIRST diverged
This is slightly simplified from the real story, but hopefully close enough.
Suppose I initially have one branch: develop. Then I create a new branch: release.
At this point, release and develop both ...
- 1,639
1
vote
1
answer
23
views
Is it safe to merge a branch created from an old commit in two, separate branches that are a lot more recent?
I have the following Git situation:
where:
I was in commit A and, from there, I continued developing towards commit B.
Arrived in commit B, I decided to create a new branch from the old commit A, ...
- 2,687
0
votes
1
answer
124
views
How to find the remote branch containing the specified commit without getting the full repository [duplicate]
I have a repository with many branches, and I have tagged each commit with a specific tag, so I can find it with git ls-remote --tags, but I can't find the corresponding branch with that tag, I don't ...
- 1
1
vote
1
answer
494
views
Why does a new git branch have the old history?
I'm studying design patterns in python and I'm doing version control in git.
The first thing I did was create a branch called "Creational Patterns", in which I made a commit for each one (...
- 840
2
votes
1
answer
81
views
How to switch to the Nth previous unique branch in Git?
Lets say I have 3 branches in my repository: main, develop and feature. Now, suppose I have switched my working branch in the following order: from main, to develop, to feature, back to develop, and ...
- 642
2
votes
0
answers
674
views
How to keep production and development git branches with different variables from conflicting with eachother?
We have one git repository serving two environments/branches: production and development.
The code between those two environments should be identical except for a few variables.
To exemplify:
in our ...
- 21