3,280 questions
Advice
1
vote
7
replies
88
views
How can I join two Git histories together
I have a team that has two Git repositories for the same application, and I'd like to graft one on to the other, and I'm not sure if that's possible or how to go about that or the right terminology to ...
- 15.5k
0
votes
1
answer
91
views
DevSecOps pipeline — scans run on test branch, but devs keep pushing to dev/preprod/prod, how to ensure new code is scanned before production?
I’m an intern working in DevSecOps. Our repo uses branches: test, dev, preprod, prod. I’ve set up scans (SAST, container scan , DAST ) triggered from the test branch.
But the dev team often pushes ...
- 9
-2
votes
3
answers
290
views
How can I work on multiple git branches at once?
Clarification: I'm asking about working on multiple branches in the same worktree. (I know how to work on multiple branches in separate worktrees, but that's not the question here.)
Suppose I'm ...
- 49.3k
0
votes
0
answers
35
views
How to handle semantic versioning when cloud and on-prem branches diverge?
I'm working on a project that maintains two active release branches:
10.0.x → for on-prem deployments
10.1.x → for cloud deployments
We have an automated system that merges changes from the on-prem ...
-1
votes
2
answers
161
views
git delete tags associated with removed branches
On GIT After I removed a branch there are tags still exists.
I used this command to delete local and then remote branch "brnch"
git branch -D "brnch"
git push origin --delete "...
- 563
6
votes
1
answer
96
views
git branch --create branchname works fine, but is not documented anywhere
git branch branchname creates new branch "branchname", we know that.
However,
git branch --create branchname also creates new branch "branchname":
yet the latter is not documented ...
- 11.5k
2
votes
2
answers
149
views
Get only git branches which match / don't match the fetch specs from `.git/config`, and delete non-matching ones
Suppose I have a .git/config as follows:
[remote "origin"]
url = [email protected]:some/repo.git
fetch = +refs/heads/main:refs/remotes/origin/main
fetch = +refs/heads/...
- 41.9k
-1
votes
4
answers
141
views
Sort branches but show current branch first
Can I sort branches by -committerdate, but also always show the current branch first?
git config --global branch.sort -committerdate
Shows more recently committed-on branches ahead of the current ...
- 404
0
votes
0
answers
59
views
How merge everything into origin/master and get rid of origin/main?
I have a git repo backed by a BitBucket instance. In this repo I appear to have three branches:
main (my local branch I guess)
origin/master
origin/main
The master naming scheme seems to be the ...
- 10.9k
1
vote
2
answers
174
views
How can I create a branch in my fork based off a branch in a different fork (of the same master)?
I have my own fork I’ve been working on for awhile:
https://github.com/udance4ever/batocera.linux/
I verified the work done in this branch of a fellow developer’s fork is something I wish to build ...
- 129
1
vote
2
answers
207
views
Running Multiple Application Instances on Different Branches in IntelliJ - Potential Class Loading Issues?
I'm trying to understand how IntelliJ handles class loading when running multiple instances of a Java application on different branches.
When you run an application directly from the IDE (like ...
- 19
2
votes
2
answers
3k
views
Why can't my github app bypass branch protection
I want to create a github app in my organization that will allow me to create an automatic versioning commit directly on the main branch after every pull request is merged to main branch.
I have a ...
- 495
-1
votes
1
answer
90
views
Will deleting specific commits from a branch affect the original branch it was created from?
I have a branch A that was created from another branch B. Some specific commits from branch B are also present in branch A. I’m considering deleting those commits from branch A, but I’m concerned ...
- 3
0
votes
1
answer
74
views
Config file does not list newly created branch
I know there are 2 ways to create a branch. Remotely using a gui version control like GitHub or locally using git bash. When I create a new branch remotely and fetch the changes using git bash, the ...
1
vote
1
answer
168
views
Git branching strategy with GitHub Actions
I am trying to build the CI / CD for learning the Devops CI and CD flows with simple branching strategy.
Branch Strategy :
| branch name | environment |
main --> prod
release/* --&...
- 61