5,474 questions
- Bountied 0
- Unanswered
- Frequent
- Score
- Trending
- Week
- Month
- Unanswered (my tags)
Best practices
0
votes
7
replies
54
views
What is the most efficient way to implement branching with a large number of outcomes in C++?
I have a function I am trying to write in C++ that takes a char and executes a unique code segment based on the character passed. I am scaling this to take around 50 characters, so I'm not sure that a ...
2
votes
1
answer
89
views
Why are J1 and J2 used with XOR in ARMv6-M BL instruction immediate calculation?
I’m trying to understand how the BL instruction is decoded in the ARMv6-M architecture.
The part I don’t get is in the imm32 calculation: the values of I1 and I2 are derived using J1 and J2, but they’...
0
votes
2
answers
133
views
How to merge only some commits from master to version branch?
We have a challenge with how things have been merged into two different branches in our (public) Git repository.
We have two branches:
master (commits: a, b, c, d, e)
maintenance-8.x.x (commits: a, x, ...
2
votes
3
answers
208
views
Why is git HEAD pointing to two branches?
The git installed on my machine always creates master when I initialize any folder as git:
PS C: \job-artifacts-and-outputs› git branch --show-current
master
So my local branch name is always master ...
0
votes
1
answer
184
views
Branch in Azure not being updated properly on PR
We are using Azure DevOps and after a few months away from working on some code I came back to some changes others have made.
We have three branches develop, release, master - that is to say DEV, QA, ...
0
votes
1
answer
45
views
Create commit from several files of another branch
Suppose I have a branch B1 that added files A, B, C, ..., Z.
Suppose I am at branch B2.
What I want is to get a subset of files (say A, E, I, O, U) from the latest state of B1 and create a commit in ...
-4
votes
1
answer
295
views
GitHub Actions workflow not showing for dev branch even though the file exists in .github/workflows
I'm encountering an issue with GitHub Actions. When I create a workflow file (e.g., ci.yml) inside the .github/workflows/ directory on the dev branch, the workflow does not appear in the "Actions&...
2
votes
0
answers
82
views
How can I make gcc with -Os do branch layout in accordance with my __builtin_expect hints, i.e., make the expected branch the fallthrough case?
How can I make gcc with -Os do branch layout in accordance with my __builtin_expect hints, i.e., make the expected branch the fallthrough case? Is there a knob I can turn?
Here's an example function:
...
0
votes
1
answer
150
views
How to set a custom upstream for a branch during its creation?
I have a workflow in which local branches end up with names that I don't really want to be visible in the remote repository. I would like to set the upstream name when I create the local branch, so I ...
2
votes
2
answers
73
views
How to get a changelog for a file on a particular branch in Mercurial
I can get the history of a file, which shows me every commit that changed that file.
I can also get a history of a particular branch and have it show me every single file change for every commit under ...
0
votes
0
answers
35
views
github different .env on different branches
This is probably trivial for experienced gitHub users but I'm struggling with this. Let's say I have three branches in github, dev, stg and prd. Each branch has a file .env. I want this file to have ...
1
vote
0
answers
119
views
`git log` shows commits not upstream any branch or tag
I often watch git log --all --oneline --graph --decorate --colors to keep an eye on my rebases. Today, something rather unsettling is showing up:
* b782b84 (HEAD -> dev, origin/dev) III
* 22fe431 ...
0
votes
1
answer
63
views
Create a new branch from a commit online in GitHub?
I need to make a new branch from an old commit because I don't want the new broken code. I want to do it on GitHub online. That is, I don't have GitHub desktop and I can't get it because of work ...
0
votes
0
answers
84
views
Compare commit in separate branches and detect common modified files
Using git I would like to monitor that branch developpers are working on separate files or at least I want to check that common modified files are the correct ones.
using different tools (tortoise or ...
0
votes
1
answer
134
views
Apache Flink Branching
Problem Overview:
I am working on a Flink application that allows users to design dataflows dynamically. The core engine is built around stages, where a DataStream is passed sequentially through these ...