Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
git-seminar
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Deploy
Releases
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Scientific Computing
education
git-seminar
Commits
f8d98c9a
Verified
Commit
f8d98c9a
authored
6 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
adds advanced notes
parent
f7961ed0
Branches
Branches containing commit
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
advanced.md
+31
-0
31 additions, 0 deletions
advanced.md
img/git-merge-is-bad.png
+0
-0
0 additions, 0 deletions
img/git-merge-is-bad.png
with
31 additions
and
0 deletions
advanced.md
0 → 100644
+
31
−
0
View file @
f8d98c9a
# git advanced -- how to maintain a comprehensible history
-
when projects get bigger
-
show bad example with merge commits
-
show git-flow being harmful
-
show git-pretty
Advanced git is not about edge use cases, it's all about keeping your history
comprehensible, i.e. understandable.
## trunk based development
-
project history, e.g. via
`gitk`
or
`git lol`
, should resemble a
**tree**
-
for this section we're sticking to the tree metaphor
-
long-lived branches basically
**master**
(and
**releases**
)
-
long trunk of tree
-
dead branches on lower trunk (old, unmaintained releases), which may also be
cut down in time if support is dropped
-
only clean merges (could have been ff)
## final chapter
-
consider like backup slides
-
show goodies
## resources
-
https://barro.github.io/2016/02/a-succesful-git-branching-model-considered-harmful/
-
https://stackoverflow.com/questions/14023648/why-does-my-git-history-look-like-a-christmas-tree
-
https://i.stack.imgur.com/ZsXT6.png
-
https://trunkbaseddevelopment.com
This diff is collapsed.
Click to expand it.
img/git-merge-is-bad.png
0 → 100644
+
0
−
0
View file @
f8d98c9a
307 KiB
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment