Differences

This shows you the differences between two versions of the page.

--- marc:linux:git [2022/08/09 09:40] – [Rebasing vs Merging] marcv
+++ marc:linux:git [2022/08/09 09:46] (current) – [Rebasing vs Merging] marcv
@@ Line 1111: / Line 1111: @@
 {{:marc:linux:rebasing1.png?direct&700|}}
+Because of these merges, there are a lot commits which are not really functional but just merges. The same goes for the other developers.
+Instead of merging the changes from remote main all the time, we can //rebase// which rewrites history:
+{{:marc:linux:rebase2.png?direct&700|}}
 ===== Git Rebase Basics =====
 ===== When NOT to Rebase =====