Differences

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

--- git [2024/10/10 05:44] – jhagstrand
+++ git [2024/10/10 05:55] (current) – [worktree] jhagstrand
@@ Line 5: / Line 5: @@
 Written by Linus Torvalds to replace svn and cvs.
+todo:
+  * streamline the submodule section
+  * streamline the internals section
+  * coordinate the "how-to" sections
+  * coordinate workflow section with "projects:developer guide" section
 =====Overview=====
@@ Line 114: / Line 119: @@
 You can push, you can pull.
 You cannot status, merge, commit, diff, etc, because these commands act on the paired worktree.
+==== push vs pull ====
+git push - pushes commits from one repo to another\\
+git pull - pulls changes and merges them into a local worktree
+if we wanted to do a pull, we could pull into webprod or webdev, then push from there to voycgit
+==== merge vs rebase ====
+if development is ongoing in the master branch
+while some special feature development is going on in the feature branch
+when you eventually merge the feature back into master, do a merge, to maintain the true history
+in the the meantime, to bring master changes into the feature, do a rebase,
+	handle the conflicts now, so the future feature merge will run without conflicts
+handle conflicts conflicts in the feature branch, not when attempting the final feature merge