Questions about git-rebase
Read more about git-rebase
python (65.1k questions)
javascript (44.2k questions)
reactjs (22.7k questions)
java (20.8k questions)
c# (17.4k questions)
html (16.3k questions)
r (13.7k questions)
android (12.9k questions)
Improve git's suggestions for merge conflicts of adjacent hunks?
Related to my previous question Git merge conflict upon rebasing adjacent deletion and insertion?
By default, git's merge algorithm can give dangerous/unhelpful suggestions.
For instance, I have somet...
kdb
Votes: 0
Answers: 0
Rebase local commits on remote subtree update
I'm trying to build a monorepo that has subtrees to other projects I'm using. In these subtrees I want to make some customizations to fit my monorepo project.
When changes occur on the remote (origina...
CodeRed
Votes: 0
Answers: 0
Is there sort of a reverse cherry-pick in Git?
tl;dr: How can I keep the current last couple of commits on a branch, and replace the history before that with that of another branch?
I have a branch where I want to keep the existing last 3 commits...
Sled
Votes: 0
Answers: 2
GIt rebase not working. Waiting for editor to close a file
I installed chocolatey and was looking forward to using it as a rebase tool because the rebase tool I get with vs code was glitchy. It wasn't working properly. When I tried using git rebase -i HEAD~2,...
Rabten
Votes: 0
Answers: 1