572 questions
Tooling
0
votes
0
replies
63
views
Reviewing conflict resolutions in GUI
Given a merge commit, git show --remerge-diff shows how the recorded merge result differs from a hypothetical re-merge.
Is there a way to see this graphically, something like a GUI tool would show a 3-...
- 3,338
4
votes
3
answers
177
views
Merging branch based off another branch that since has been merged (with squash and delete)
I am running into some weird merge conflict issues even though I am the only one working on the repository and have only made linear commits.
I have these branches:
main
feature-A (based off of main)
...
- 1,780
0
votes
1
answer
116
views
Is there a command to "accept both changes" and swap the order in VSCode?
I prefer to use the normal text editor (not the merge editor) to resolve merge conflicts in VSCode. Sometimes, I need to accept both changes, but want the new text from the "incoming" change ...
- 1,559
0
votes
1
answer
73
views
`git rebase --interactive` always use rebase-then-squash workflow and introduce many conflict resolution, how to switch to squash-then-rebase?
Here is a typical example of executing git rebase --interactive --autosquash:
git rebase --interactive --update-refs origin/master
Rebasing (1/102)
Rebasing (2/102)
error: could not apply eff00df3... ...
- 3,860
1
vote
2
answers
130
views
Is there a better way to commit conflict resolution changes separately when doing a git rebase other than committing conflict markers? [closed]
I have a feature branch that I want to rebase on main with conflicts that need to be resolved. I want to resolve these conflicts in a separate commit to my original changes. My branch has two commits, ...
- 63
0
votes
1
answer
139
views
What does `git diff` actually compare during a rebase conflict?
I have recently learned that git diff --cached shows how the new commit during an interactive rebase conflict after resolving the conflict looks. What does git diff compare during resolving a git ...
- 79
0
votes
1
answer
452
views
GitHub Actions stuck: Expected - Waiting for status to be reported
GitHub Actions have stopped running. They are stuck with the message: "Expected - Waiting for status to be reported". Other messages on the pull request page are: "Checks awaiting ...
- 12.8k
0
votes
4
answers
178
views
Squash a single conflict fixing incorrect merge conflict resolution into merge commit
This is a scenario I've run into multiple times: suppose you have a feature branch, and you then need to merge in the develop branch and resolve conflicts prior to your PR being merged. You merge ...
- 1,142
1
vote
4
answers
121
views
Testing versions of code with shared portions
I am trying to understand what is the process for testing two versions of the code while making changes to common code that is identical across versions. I want to have branch-specific code that is ...
- 726
3
votes
1
answer
123
views
When removing a file from history, what makes it still left in tree?
I have a private file that leaks into the repo, and I want to delete it. Here are the commits I suppose that it is first added:
git log --follow --diff-filter=A --find-renames=40% --pretty=reference --...
- 3,420
0
votes
1
answer
221
views
Merging with meld: hideResolved vs useAutoMerge
As far as I know, there are two options to make meld automatically merge the changes which do not conflict.
What is the difference between both options, and which is preferred?
git config --global ...
- 28k
0
votes
1
answer
325
views
How to drop changes to submodule ref from commit during rebase
I'm rebasing my branch on origin/master using
git pull --rebase origin master
Now I get some merge conflicts regarding git submodule updates:
diff --cc cpp_lib
index c14a3fe5,71b17a71..00000000
--- a/...
- 5,472
0
votes
4
answers
151
views
How to find all branches with merge conflicts?
I know various ways to list git branches (just git branches or get for-each-ref) as well as how to check each individual branch if it has conflicts with another (lets assume origin/develop for now):
...
- 7,325
-1
votes
2
answers
114
views
git rebase --rebase-merges produces merge conflicts
I have a git repository that has two branches with unrelated history like this
A'
A - B - [...] - C
where the [...]-part is complicated (non-linear and many commits). Both the commits A and A' are ...
- 353
1
vote
1
answer
95
views
Git Rebase Dilemma: Sort out the tangled feature branches
I had a feature branch which was based off of develop, let's call it feature-1. At the same point in time I also took another feature branch feature-2.
feature-1 was a real feature branch that I've ...
- 1,308