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
@@ -88,16 +88,16 @@ During the open house session we collected topics we would find interesting to h
88
88
-[Visualizing Git Concepts with D3](http://onlywei.github.io/explain-git-with-d3/)
89
89
- Collaborate on a meaningful example to convey mental model/understanding which would still be motivating
90
90
- Recovering from making commits to the wrong branch
91
-
-https://coderefinery.github.io/git-intro/recovering/ (materials exist but we typically don't manage to teach this due to time in our "normal" workshop)
91
+
-<https://coderefinery.github.io/git-intro/recovering/> (materials exist but we typically don't manage to teach this due to time in our "normal" workshop)
92
92
- Undoing/partially doing add (command-line or GUI-assisted)
@@ -111,7 +111,7 @@ During the open house session we collected topics we would find interesting to h
111
111
112
112
- Interactive rebase to squash/delete/re-order commits
113
113
- Gradually introduce rebase: Amending/Fixup first, then interactive rebase. Do not overwhelm with full power, links into creating clearer history while working.
114
-
- XKCD comic as motivation to git rebase. This repository implements the git history of that comic and fixes it: https://github.com/ssciwr/git-rebase-xkcd-example (Details in Heidelberg university material)
114
+
- XKCD comic as motivation to git rebase. This repository implements the git history of that comic and fixes it: <https://github.com/ssciwr/git-rebase-xkcd-example> (Details in Heidelberg university material)
115
115
- Squashing commits into a logical unit using reset
116
116
117
117
- Creating clearer history while working
@@ -127,21 +127,21 @@ During the open house session we collected topics we would find interesting to h
127
127
- Which branches and commit have you worked on? (Analysing/Debugging history - Meta Level)
128
128
- Searching through code changes with "pickaxe"
129
129
- Finding a commit that introduced a bug with git annotate or bisect
130
-
- Example repository with two bugs hidden in history (1 functional, 1 performance): https://github.com/ssciwr/git-bisect-example (Details in Uni Heidelberg material)
130
+
- Example repository with two bugs hidden in history (1 functional, 1 performance): <https://github.com/ssciwr/git-bisect-example> (Details in Uni Heidelberg material)
131
131
132
132
133
133
### Collaborative workflows
134
134
135
135
- Importance of having a workflow: contributing changes is key for reproducibility, many users fork a project and change it and then just use their own version. Also trains useful transferable skills to industry/research software engineering.
- (not sure where this goes) <https://carpentries-incubator.github.io/collaborative-git-and-github-lesson/aio.html>
139
139
- Git project guidelines, i.e., no merge request without an issue, only a limited number of people merge to master/main, etc. A collection of the most important guidelines, familiarize participants with different options.
-[Blog Post on why 'gitflow' may not be a good fit for your project](https://medium.com/@onatkorucu/dont-use-git-flow-in-2023-move-to-trunk-based-development-instead-1ac5bd7cb10)
146
146
-[Blog Post on alternatives to Gitflow](https://moldstud.com/articles/p-what-are-some-alternative-workflows-to-gitflow-that-developers-can-consider)
147
147
- Working with PR/MRs and code review
@@ -182,7 +182,7 @@ During the open house session we collected topics we would find interesting to h
182
182
- how to customize fish shell for Git
183
183
- how to use GUI for line-based "git add -p" commands, difftool, mergetool
0 commit comments