TortoiseGit Tutorial 14: git rebase basics

preview_player
Показать описание
It explains the git rebase basics. After watching this video, one would understand the use of git rebase and how to perform git rebase interactive using tortoiseGit tool. It also shows merging of rebased feature branch on top of it's parent branch. It also explains the difference between git rebase vs git merge.
Рекомендации по теме
Комментарии
Автор

Yeah this is a good explanation. Thank you for your contribution.

This is very good for someone whose first language is not English. Words like "diverge" rather than "taken out" and "broken" (verb) rather than "break" (noun). These are advanced concepts but I hope that those who teach should also be happy to learn, yes?

3:27 "a" Fast-Forward merge.

TheOceanLoader
Автор

Great course! The best videos in YouTube about Tortoise Git. Thank you very much!

jwcspb
Автор

Fantastic tutorial. It would also be nice if you had shown the log at the beginning to be able to compare with the resulting rebase operation. Overall great tutorial

harveynorman
Автор

Greatly Explained !, Among many videos I liked this one due to demonstration example.

pareshpatel
Автор

Thanks for a very clear explanation. I understand that rebase is better option when the feature branch is not checked in. What is the better option to resolve conflicts if the feature branch is already checked in ?
1. I am rebasing it with dev
2. resolving conflicts and commit is done
3. when i wan to push the changed, of course it asks to pull first.
4. Now there will either be conflicts or if the pull is success and push is done then the log is not linear because the origin feature branch's log is merged.
How to resolve this ?
thanks in advance.

koundinyabhogaraju
Автор

Lovely explanation, was struggling with this concept and this video helped me a lot, thank you :)

fwd