Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
Git Workshop
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD 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
osak
Git Workshop
Commits
0782c59a
Verified
Commit
0782c59a
authored
6 months ago
by
Lars Frost
Browse files
Options
Downloads
Patches
Plain Diff
Improve Best Practices
parent
996c8f2f
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
materials/slides/collaboration.typ
+67
-27
67 additions, 27 deletions
materials/slides/collaboration.typ
with
67 additions
and
27 deletions
materials/slides/collaboration.typ
+
67
−
27
View file @
0782c59a
#
import
"
@preview/touying:0.5.3
"
:
*
=
Collabo
rati
on
=
Best
P
ra
c
ti
ces
==
Wie
sieht
ein
guter
Commit
aus
?
===
Vollst
ä
ndig
...
...
@@ -9,36 +9,76 @@ Vor und nach dem Commit sollte alles außer dem beabsichtigten geänderten Verha
===
Atomic
Wenn
es
sinnvoll
sein
kann
den
Commit
teilweise
zu
reverten
,
ist
er
zu
gro
ß
.
==
The
Not
Rocket
Science
Rule
Of
Software
Engineering
"
maintain a branch that always passes all the tests
"
//
==
The
Not
Rocket
Science
Rule
Of
Software
Engineering
//
//
https
:
//
graydon2
.
dreamwidth
.
org
/
1597.
html
//
Maintain
a
branch
that
always
passes
all
the
tests
\
//
-
basierend
auf
Regel
von
Graydon
Hoare
Implemented
in
:
-
#
link
(
"
https://docs.gitlab.com/ee/ci/pipelines/merge_trains.html
"
)
[
GitLab
:
Merge
Trains
]
-
#
link
(
"
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
"
)
[
GitHub
:
Merge
Queues
]
//
Implemented
in
:
//
-
#
link
(
"
https://docs.gitlab.com/ee/ci/pipelines/merge_trains.html
"
)
[
GitLab
:
Merge
Trains
]
//
-
#
link
(
"
https://docs.github.com/en/repositories/configuring-branches-and-merges-in-your-repository/configuring-pull-request-merges/managing-a-merge-queue
"
)
[
GitHub
:
Merge
Queues
]
==
Wie
sieht
eine
gute
Commit
Message
aus
?
So
nicht
.
#
align
(
center
,
link
(
"
https://github.com/MontiCore/monticore/commits/dev/?after=f7fb15d399f3283af3e9c8a795bf3366768870d6+90
"
,
image
(
"
/images/BR.png
"
,
height
:
auto
)))
#
let
pad
-
spaces
(
n
,
width
)
=
{
let
s
=
str
(
n
)
if
s
.
len
()
<
width
{
return
"
"
*
(
width
-
s
.
len
())
+
s
}
return
s
}
#
show
raw
.
where
(
block
:
true
):
code
=>
{
show
raw
.
line
:
line
=>
{
text
(
fill
:
gray
)
[
#
pad
-
spaces
(
line
.
number
,
2
)
]
h
(
1
em
)
line
.
body
}
code
}
==
Wie
sieht
eine
gute
Commit
Message
aus
?
Beispiel
//
#
link
(
//
"
https://github.com/bevyengine/bevy/commit/0ac495f7f42ec91e2d215e5afa56d9c4a9c1741f
"
,
//
```
txt
//
Remove
accesskit
re
-
export
from
bevy_a11y
(
#
16257
)
//
#
Objective
//
-
Fixes
#
16235
//
##
Solution
//
-
Both
Bevy
and
AccessKit
export
a
`
Node
`
struct
,
to
reduce
confusion
//
Bevy
will
no
longer
re
-
export
`
AccessKit
`
from
`
bevy_a11y
`
//
##
Migration
Guide
//
-
Users
will
need
to
add
`
accesskit
=
"
0.17
"
`
to
the
dependencies
//
section
of
their
`
Cargo
.
toml
`
file
and
update
their
`
accesskit
`
use
//
statements
to
come
directly
from
the
external
crate
instead
of
//
`
bevy_a11y
`
.
//
-
Make
sure
to
keep
the
versions
of
`
accesskit
`
aligned
with
the
//
versions
Bevy
uses
.
//
```
//
)
#
link
(
"
https://
github.com/bevyengine/bevy/commit/0ac495f7f42ec91e2d215e5afa56d9c4a9c1741f
"
,
"
https://
cbea.ms/git-commit
"
,
```
txt
Remove
accesskit
re
-
export
from
bevy_a11y
(
#
16257
)
#
Objective
-
Fixes
#
16235
##
Solution
-
Both
Bevy
and
AccessKit
export
a
`
Node
`
struct
,
to
reduce
confusion
Bevy
will
no
longer
re
-
export
`
AccessKit
`
from
`
bevy_a11y
`
##
Migration
Guide
-
Users
will
need
to
add
`
accesskit
=
"
0.17
"
`
to
the
dependencies
section
of
their
`
Cargo
.
toml
`
file
and
update
their
`
accesskit
`
use
statements
to
come
directly
from
the
external
crate
instead
of
`
bevy_a11y
`
.
-
Make
sure
to
keep
the
versions
of
`
accesskit
`
aligned
with
the
versions
Bevy
uses
.
Summarize
changes
in
around
50
characters
or
less
More
detailed
explanatory
text
,
if
necessary
.
Wrap
it
to
about
72
characters
or
so
.
In
some
contexts
,
the
first
line
is
treated
as
the
subject
of
the
commit
and
the
rest
of
the
text
as
the
body
.
The
blank
line
separating
the
summary
from
the
body
is
critical
(
unless
you
omit
the
body
entirely
);
various
tools
like
`
log
`
,
`
shortlog
`
and
`
rebase
`
can
get
confused
if
you
run
the
two
together
.
Explain
the
problem
that
this
commit
is
solving
.
Focus
on
why
you
are
making
this
change
as
opposed
to
how
(
the
code
explains
that
).
Are
there
side
effects
or
other
unintuitive
consequences
of
this
change
?
Here
'
s the place to explain them.
If you use an issue tracker, put references at the bottom:
Fixes: #123
See also: #456, #789
```
)
...
...
@@ -46,7 +86,7 @@ versions Bevy uses.
#v(1fr)
=== Was ich aus der Message lernen soll
-
Welche
Verhaltens
ä
nderung
wurde
beabsichtig
?
- Welche Verhaltensänderung wurde beabsichtig
t
?
- Warum gibt es diese Änderung?
- "If applied, this commit will ..." oder "After this commit, the program will ..."
...
...
@@ -64,6 +104,6 @@ versions Bevy uses.
- Imperativ
- Großgeschrieben anfangen
- Ohne Punkt am Ende
-
Titel
$
approx
50
$
Zeichen
,
maximal
$
72
$
- Titel $
<
50$ Zeichen, maximal $72$
#v(1fr)
\ No newline at end of file
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