You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
{{ message }}
Repository navigation
What is your opinion on the value and applicability of git-rebase? #174
Hi trevorbowen! I'm the friendly 🤖 of the GitHub Training Team.
I can see that you're already a collaborator. Any other issues are above my paygrade at the moment, so we'll have to wait for a pesky hu-man trainer. Not to worry though, they'll drop by within 24 hours to answer your questions!
@trevorbowen great question! There are many, many opinions on this and most have some very valid arguments for and against using rebase as a strategy.
At the end of the day, it comes down to the visual representation of the history. If you use the standard recursive merge in git, your history will include a visual representation of the point where branches were merged together thanks to the merge commit git adds. However, if you use a rebase, you are always doing a fast-forward merge and your history will look like a single line of commits.
My one recommendation is this - if you are going to use rebase - use the rebase option on github.com. This will prevent some of the common issues that crop up when people rebase commits that have previously been pushed to the remote.
Activity
teacherbot commentedon May 19, 2017
Hi trevorbowen! I'm the friendly 🤖 of the GitHub Training Team.
I can see that you're already a collaborator. Any other issues are above my paygrade at the moment, so we'll have to wait for a pesky hu-man trainer. Not to worry though, they'll drop by within 24 hours to answer your questions!
crichID commentedon May 19, 2017
@trevorbowen great question! There are many, many opinions on this and most have some very valid arguments for and against using rebase as a strategy.
At the end of the day, it comes down to the visual representation of the history. If you use the standard recursive merge in git, your history will include a visual representation of the point where branches were merged together thanks to the merge commit git adds. However, if you use a rebase, you are always doing a fast-forward merge and your history will look like a single line of commits.
My one recommendation is this - if you are going to use rebase - use the rebase option on github.com. This will prevent some of the common issues that crop up when people rebase commits that have previously been pushed to the remote.