GIT merge vs rebase. Oksana Boyarko

Oksana Boyarko lead educational evening in DEWEB Studio today.


Control system of versions GIT makes life easier for teamwork on the project.
Git - is a useful tool, it can easily create trees for individual parts of the project.
But when the master tree actively changes, it need to be constantly updated.
Everyone knows about the merge command, and a lot of us afraid to use rebase command. Both help to update tree with remote master, but they do it in a different way.
Merge will save full history of code development, while rebase make it cleaner and straightforward, although it hide many pitfalls, including positive such as union of commints and delete the useless messages from the history.



We hope that now you are a bit safe with using command rebase :)

Social activity