Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
R
Release
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Container Registry
Model registry
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
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
Development
Release
Commits
35b2f38a
Commit
35b2f38a
authored
5 years ago
by
JoeMurray
Browse files
Options
Downloads
Patches
Plain Diff
Added conflicts of interest section, fixed typo
parent
64a016fa
No related branches found
No related tags found
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
doc/merger-intro.md
+13
-1
13 additions, 1 deletion
doc/merger-intro.md
with
13 additions
and
1 deletion
doc/merger-intro.md
+
13
−
1
View file @
35b2f38a
...
...
@@ -80,6 +80,18 @@ particular bias/pre-commitment on this question. This is high-risk/high-reward
add
*more*
issues without resolving the old issues. Reward: if the new participants agree, then it can tilt the
balance more clearly.
## (Perceived) Conflicts of Interest
Historically there have been concerns that some PRs might be too easily accepted if a merger had some conflict of interest.
For example, if they worked for a company that had a client contract that would benefit from a core change, and a
colleague on the project submitted the PR. Would the merger potentially go easy on not requiring a unit test in order to
avoid the cost if their project was over budget? Would they merge a PR involving some controversial change
without ensuring the normal consultation it merits?
In such cases the practice has been for the merger with a potential conflict to mark the PR as 'merge-ready' and solicit a
different merger to do the merge. This provides a formal way to ensure impartiality and the perception of impartiality in
the merge process.
## Master, RC, and Stable
Each version passes through phases of development/alpha, RC/freeze/beta, and stable/maintenance. As a rule of
...
...
@@ -96,7 +108,7 @@ The stages are discussed in more detail in the primary [README.md](../README.md)
Three channels are generally important for anyone who merges:
*
`product-maintenance`
(public) - Planning/coordination around criticals and regressions
*
`dev-post-release`
(public) - Special escalation for new problems
s
that are distinct to the most recent release
*
`dev-post-release`
(public) - Special escalation for new problems that are distinct to the most recent release
*
`mergers`
(private) - Admin chatter
## History: Upgrades, customizations, 2.x - 5.x eras
...
...
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