Home > Software engineering >  Git rebase conflict, which branches are actually modified?
Git rebase conflict, which branches are actually modified?

Time:12-08

So even after doing it plenty of time, I am still very scared of rebasing, and I think one the problem I have is I do deeply understand what it does.

So I have branch develop and my branch, starting out of develop. To avoid/solve conflict, I wish to update from which commit is my branch starting. For that reason, on my branch I perform a git rebase develop.

My question is, Let say , during the rebasing phase, I decide to delete/modify every single changes performed. Once I push, will only my branch will be modified, or my rebase did also modified the actual commit from develop ?

CodePudding user response:

Only the branch you're currently on will be modified. The branch you're rebasing onto will not be touched: it's only used as a starting point for the work.

If you want to understand git more in depth, I recommend reading enter image description here

CodePudding user response:

As kapsiR commented, have no fear. Well, maybe have a little, just enough to take a few precautions, like running git status often.

  •  Tags:  
  • git
  • Related