python (12.9k questions)

javascript (9.2k questions)

reactjs (4.7k questions)

java (4.2k questions)

java (4.2k questions)

c# (3.5k questions)

c# (3.5k questions)

html (3.3k questions)

Questions - git-rebase

Peepcode-git.pdf: Best strategy to keep a long standing feature branch in sync with main branch with rebase

In the following documentation peepcode-git.pdf located at https://github.com/pluralsight/git-internals-pdf/releases, page 39 notes different use cases for rebase. Particularly this quote: "If yo...
test-img

LeanMan

git

version-control

git-merge

git-rebase

branching-and-merging

Votes: 0

Answers: 1

Latest Answer

This is a simple misunderstanding. The suggestion is not what you assumed: If I am working on a long task however, I don't quite understand the idea of rebasing main onto my branch to stay in sync......
test-img

TTT

git rebase --continue command not getting work

Hi Everyone i trying to rebase local branch from origin master steps git pull origin master git checkout driver_management git rebase master git add . git rebase --continue while exicute git reb...
test-img

Ashish Pandey

git

github

git-rebase

Votes: 0

Answers: 1

Latest Answer

The window whose text you pasted in your question is just a manual pause asking for a commit message, before making the commit and continuing the rebase. If you are OK with the commit message already...
test-img

Tim Biegeleisen

How to merge two commits from different branch?

let say i have a commit 1 which is already present in branch A. I have a new commit 2 in branch B, i want to move this commit 2 to branch A and merge with commit 1.
test-img

sai satyanarayana kolli

git

git-merge

git-rebase

Votes: 0

Answers: 1

Latest Answer

My answer assumes that by "merge", you actually meant "squash", given the way you used it in your question. ⚠️ Doing the following will rewrite history. (replace refs below with ...
test-img

Inigo

Git Merge Fast-Forward vs Git Rebase

What is the difference between a fast-forwarded git merge and a git rebase? Don't both accomplish keeping history linear and no merge commits? If so, why would one use one over the other? If not, whic...
test-img

Newo

git

git-merge

git-rebase

fast-forward

Votes: 0

Answers: 1

Latest Answer

When you are ahead of main, both do the same thing. If you're ahead and behind main, then a fast-forward merge isn't possible, since there are newer commits on master. But in that case, you can rebase...
test-img

jessehouwing

Posts

Questions

Blogs

Jobs