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
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Deploy
Releases
Package Registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Code review analytics
Issue analytics
Insights
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
Maximilian Konzack
git-seminar
Commits
871f5703
Verified
Commit
871f5703
authored
5 years ago
by
ck85nori
Browse files
Options
Downloads
Patches
Plain Diff
adds rough content of pandoc papers
parent
46b0c48e
No related branches found
Branches containing commit
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
paper.md
+68
-3
68 additions, 3 deletions
paper.md
with
68 additions
and
3 deletions
paper.md
+
68
−
3
View file @
871f5703
## branching model
% pandoc papers
% Christian Krause
### multi master
# intro
## goals
-
focus on content/writing
-
next generation communication
-
avoid emails with attachments, right?
-
reviews!
-
automated publishing
# tool overview
## markdown
-
easy to learn, read and write
-
no distractions to procrastinate
-
no fiddling with WYSIWYG
## git
-
version control
-
free backup
-
easy revert
## GitLab
-
self-hosted, full control
-
communication: discussion and reviews
-
continuous deployment to e.g. cloud storage
## pandoc
-
render markup source to high quality PDF
-
markup usually less powerful than LaTeX, but inline LaTeX can be used
-
supports templates e.g. for different journals or iDiv branding
## make
-
automate build
-
create images with visualization tools (see below)
# optional tools
## Graphviz/dot
-
graph visualization language
-
define flowcharts with code
-
**dot**
handles rendering
-
use
**make**
to automatically build
## R scripts
-
turn scientific computing results (CSV) to charts
-
use
**make**
to automatically build
# branching model
## multi master
-
paper with many journals, different paper text
-
one branch per journal
-
carefully
**cherry-pick**
additions to all masters
##
#
trunk based development
## trunk based development
-
same paper text
-
different themes for journals
-
journal-themes via sub-module --> make them reusable
# misc
## helpful commands
Better diff command for text:
...
...
@@ -19,3 +79,8 @@ Better diff command for text:
```
bash
git diff
-w
--ignore-blank-lines
--word-diff
```
## unsolved problems
-
to wrap or not to wrap
-
true paragraph-based diff
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