Skip to main content

Git rebase vs Git merge

While working with git and github one will always face the need to combine their changes with the master branch of the team repository. to do this we have two solutions; we either use git merge or git rebase. To explain the differences between these two options we are going to consider the following example, you start working on feature branch for the sidebar of your website and other team members are updating the master branch with new commits. This will result in forked history as shown in the picture below.

A forked commit history

Merge:

We can do the easiest option which is merging the master branch into the sidebar branch with this git command:

git merge sidebar master

This will create a new commit for the merge that connects both of these two branches, giving what looks in the picture below.

Merging master into the feature branch
So as you have seen merging is easy and really simple to work with. It's also a non-destructive operation; by this I mean that the already existing branches are not changes in any way. 

Rebase:

The other option would be rebasing the sidebar branch on top of the master branch using these commands:

git checkout sidebar
gi rebase master

This will move the entirety of the sidebar branch on the tip of the master branch, doing that will incorporate all of the commits in master. But this will re-write all of the commit history because git rebase is a destructive operation.

Comments

Post a Comment

Popular posts from this blog

Middlewares

Middlewares in Javascript are functions that come in the middle of the request-response cycle. They have access to both the request and the response object as well as the next middleware function to be executed; usually called next(). Popular examples on middleware include: body-parser, cors, session, cookie-seesion and cookie-parser.
Post a Comment
Read more

Relational Databases

Relational databases are, well... a collection of data items that have relations between them. These relations are made by associating a one table's primary key with another table's foreign key. It is a great advancement from the old long table that was used to store data which was inefficient in terms of search, memory and space.  And as for normalization; it means a process in which tables are structured to eliminate redundancy and repetition among data and the CRUD operations side-effects. And as a direct result we improve the performance of our queries. An example of a relational database would be two tables; one for student and the other for school. Both of these tables have a column for the school id, and so we make a connection between by assigning the first one as a primary key and the other as foreign key.
Post a Comment
Read more

Greenfield Project

This is a project where me and other three people joined forces to build it together. It started with meeting each other on the first day to decide on the project idea. After a couple hours of brainstorming we finally decided on a particular thing to do; and it was a web app to help manage a school system. This app was aimed at teachers, parents and students, in addition to admins moderating the system. We started big and worked our way through the waffle tasks but got overwhelmed along the way since it was a very big project for both our limited time and our team members' technical abilities. We faced many difficulties while working on this project; especially setting up mysql and getting it to work on all of our team members' machines. We switched to setting it up locally because the website we used to host our database kept showing an error of too many users so we kept testing locally until we hosted it online on a different website before the end of the time period. We work...
Post a Comment
Read more