Stack Overflow
Stack Overflow

Questions tagged [rebase]

Changing the starting point of a branch in a Version Control System.

An operation in a version control system or a special way of creating a shared library. (In order of the question counts in Stack Overflow)

Version Control Systems

In some source control system (also known as Version Control Systems o ) that support a rebase is one of the ways of integrating the changes of one branch into another by changing the "father" or starting point of a branch.

Git

See .

Darcs

Support it's still in an early status (March 2013)

Mercurial

There is a Rebase Extension for mercurial as noted in "How to do a rebase like git's rebase"

Subversion

There is no rebase support but using merge --reintegrate might be considered as a similar operation as mentioned in "Subversion rebase?" and "Subversion Branch Reintegration v1.5"

Shared Libraries

Creating a shared library to avoid conflicts with other libraries in the usage of virtual memory. (Wikipedia)

2189 questions
0
votes
1 answer

How to show difference of new Pull Request and an existing Pull Request?

I currently have a PR that has not been merged with the Master branch. And I just created a new PR, and I would like to ONLY see the difference between this new PR and the original PR above. Is there an easy way to do this? I tried to rebase but…
user21158996
0
votes
1 answer

after rebase, how do you review all the accepted changes?

After a long, complicated rebase involving merge conflicts and the like, it would be nice to have a look at the accepted changes all at once.
Kay V
  • 3,738
  • 2
  • 20
  • 20
0
votes
0 answers

Check the diff for the resolved conflicts by git rebase

I have successfully resolved the conflict, using git pull --rebase origin main git add git rebase --continue After some days, I realised, I might have made mistake while resolving conflict. Picked the wrong code maybe. Q: How to check…
Jay Joshi
  • 1,402
  • 1
  • 13
  • 32
0
votes
1 answer

If a git rebase is found to be in-progress, are the local files affected?

I have a website being served, and someone began (but did not complete) an interactive rebase. I want to know if aborting the rebase will affect the actual current state of the files being served. Since I am ok with the state of the website as it…
Matt
  • 51
  • 5
0
votes
0 answers

Local branch diverged after git pull --rebase

In my local branch, I ran the following to get the latest commits from main and rebase on top $ git pull --rebase origin main but ended up seeing a few conflicts. Seemingly resolved them but git status shows my branch has diverged. $ git…
xyf
  • 664
  • 1
  • 6
  • 16
0
votes
1 answer

Why rebase add other's commit to my pr in GitHub

I have searched for similar question like Accidentally added other's commits to my PR using git rebase. The answer for that just provide a method to remove unwanted commit from pr, but I still don't know why this happen. These are commands to…
Animeta
  • 1,241
  • 3
  • 16
  • 30
0
votes
0 answers

rebase mybranch with master when we have 20-30 number of commits

I am trying to rebase mybranch with master and changes are a lot. I am getting so many merge conflict and have 20-30 number of commits. I even tried to squash all commits and rebase it but that also taking too much time. Is there any smart/easy way…
Aditi Singh
  • 92
  • 7
0
votes
1 answer

Change the git commit author's email but keep the same commit timestamps

I've changed my email address. In GitHub, I now have "oldemail@gmail.com" and "newemail@gmail.com". So, with whatever email I use to commit and push on GitHub, these commits are recognised as mine. Note that for the following explanations, I'm…
antoninhrlt
  • 33
  • 5
0
votes
1 answer

GitLab says merge conflicts must be resolved but there are no conflicts

I have a feature/new-feature branch that I'm trying to fast-forward merge into qc branch. I've been doing this all this time without issues, when all of a sudden today, Gitlab does not allow me to merge due to "Merge blocked: merge conflicts must be…
Rachel Nicolas
  • 995
  • 2
  • 12
  • 20
0
votes
0 answers

How to collaborate on the same branch on a rebase workflow

Suppose I'm in a git rebase workflow and I have a feature branch with some new commits (rebased on top of master) and another developer joins me to work on that branch - so he also adds some commits. Now we need to integrate some changes from master…
Dean
  • 6,610
  • 6
  • 40
  • 90
0
votes
2 answers

git branching advanced usage, rebase from upstream branch

Following up on Git: rebase onto development branch from upstream, basically the same ask as: I have local master and develop branches. I do all my work on develop and then merge them into master for releases. There is a remote branch,…
xpt
  • 20,363
  • 37
  • 127
  • 216
0
votes
1 answer

Git rebase after pulling

currently I'm in trouble using rebase. feat E(PR1) ---------> H(merge commit) / / \ (on trouble!) master A-B - C - - - - - - -> F \ /(merged) /(merged) tmp ... G - - - - - - -…
Justin Seo
  • 59
  • 8
0
votes
0 answers

GitHub Desktop client - Difference between Update from naster and Rebase Current Branch

I'm trying to understand what is difference between these two items in Branch menu Update from master and Rebase Current Branch I tried both commands and it seems to me that they do the same thing - Rebase from master to current branch.
Tomanek1
  • 65
  • 4
0
votes
1 answer

Replace previous commit with commit that was amended

Lets say I'm developing feature A on branch feat-a. I am done with the feature, I commit my changes in commit X and push and create a pull request and ask for it to be reviewed. In the meantime I start work on feature B git checkout feat-b which…
sev
  • 1,500
  • 17
  • 45
0
votes
0 answers

How to avoid conflicts with remote after git rebase?

I realize this might be a common problem, but so far I was not able to find a good solution via google/so search. I have the following git branch setup: $ git branch -a * my_feature main remotes/origin/HEAD -> origin/main …
Roland Deschain
  • 2,211
  • 19
  • 50
1 2 3
…
99
100