Why git rebase deletes the files?

Hello! Please tell me why git command `git rebase master removes files that were created, sakimichan and already running on the networks?
Very strange behavior, who are faced with this, please tell me what could be the problem.
Merge request is pretty big.
Thank you!
June 5th 19 at 21:49
1 answer
June 5th 19 at 21:51
I suspect that you need to understand how exactly does rebase.
When you run git rebase master, git will do this:
  • you will find the beginning of the current branch
  • git checkout master
  • in the loop will apply a single commit from the current branch, to the extreme. If there is a conflict, the process will be, git will prompt you to resolve the conflict, and then allow you to continue.

It's good behavior during the rebase.
In your case, I suspect there is a conflict, so git does not reach the commits where there are the files you need. If the conflict is to resolve and do git rebase --continue , the process continues.
Itself rebase removal of any file does not imply only the use of commits.

And surely noticed that rebase published branches should not do.
published branches

means that started?

If the conflict is to resolve and do git rebase --continue process will continue

How can he continue if my files disappear? - Daryl.Sau commented on June 5th 19 at 21:54
after the command files git rebase --continue do come back
Thank you) - Daryl.Sau commented on June 5th 19 at 21:57
,
means that started?

Yes, this is what it means
How can he continue if my files disappear?

Very simple. Again, in the process of git rebase is almost branch to the master branch (in your case) where I needed the files yet. And then begins to apply the commits one by one. And some commit will come the file. If there are no conflicts, this process will be transparent and you will not see the intermediate commits. But as the conflict is, Gita need your help to resolve them. - Cletus.Rolfson96 commented on June 5th 19 at 22:00

Find more questions by tags Git