Skip to content

Commit 67a20a8

Browse files
committed
Fixing merge conflict in README
2 parents dd51b1f + 3833f9a commit 67a20a8

35 files changed

+259
-73
lines changed

.github/workflows/link-checker-prs.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ jobs:
2121

2222
- name: Get changed files
2323
id: changed-files
24-
uses: tj-actions/changed-files@v45
24+
uses: tj-actions/changed-files@v46
2525

2626
- name: Filter markdown files only
2727
run: |

.lycheeignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,5 @@ https://m.dotdev.co/how-to-write-a-readme-that-rocks-bc29f279611a
1212
https://www.chathamhouse.org/about-us/chatham-house-rule
1313
https://www.linkedin.com/in
1414
# from source-code-inventory.md / no longer reachable but we want to keep the link in the pattern in case we find it again.
15-
https://github.com/trieshard/source-strategy-assessment/blob/master/framework.md
15+
https://github.com/trieshard/source-strategy-assessment/blob/master/framework.md
16+
https://dl.acm.org/doi/10.5555/3158161.3158175

README.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,8 @@ Our mission
9393
* [Circle Communities](/patterns/1-initial/circle-communities.md) - *InnerSource adoption is slow in organizations due to limited understanding, engagement, and contextual relevance. Circle Communities address this by fostering synchronous conversations that build connections, close knowledge gaps, and cultivate collaboration and continuous learning.*
9494
* [Internal Developer Platform](/patterns/1-initial/internal-developer-platform.md) - *As InnerSource adoption increases throughout an organisation, it is not unusual that project teams start to face inefficiencies in scaling their efforts due to fragmented tooling, environments, and workflows. An Internal Developer Platform (IDP) provides a way to tackle this type of challenges through a centralized, self-service system that standardizes development environments and integrates tools to enhance consistency, collaboration, and developer productivity.*
9595
* [Document Architecture Decisions](/patterns/1-initial/document-architecture-decisions.md) - *InnerSource contributors often face challenges in grasping the system's design rationale, which can result in misalignment between maintainers, contributors, and stakeholders — potentially discouraging participation. To enhance decision-making and transparency, we recommend capturing architecture decisions and their consequences in a lightweight, accessible format to streamline onboarding, clarify decisions, and support long-term project sustainability.*
96-
* [InnerSource Incentives and Disincentives](/patterns/1-initial/incentives-and-disincentives.md) - *Lack of awareness for incentives as well well as disincentives for InnerSource contribution decrease the chances of an InnerSource project receiving contributions; this is addressed by sharing a comprehensive list of potential incentives and disincentives.
96+
* [InnerSource Incentives and Disincentives](/patterns/1-initial/incentives-and-disincentives.md) - *Lack of awareness for incentives as well well as disincentives for InnerSource contribution decrease the chances of an InnerSource project receiving contributions; this is addressed by sharing a comprehensive list of potential incentives and disincentives.*
97+
* [Walk the InnerSource talk](/patterns/1-initial/walk-the-innersource-talk.md) - *Teams across the organization are encouraged to adopt InnerSource principles such as working openly, sharing code, and collaborating transparently. But, if the team behind the InnerSource initiative doesn’t follow these practices themselves, it undermines credibility and adoption. Therefore, this team should lead by example: documenting their decisions as code, working in the open, and treating their work as an InnerSource project to build trust and show others how it’s done.*
9798
* [Require InnerSource before Open Source](/patterns/1-initial/innersource-before-open-source.md) - *Maintaining and managing open source projects can be challenging for organizations, due to a lack of internal infrastructure and people with the knowledge of the required collaboration practices. By requiring projects to be InnerSource before becoming open source, teams have time to establish the necessary internal support, governance, and collaboration skills needed for successful community engagement.*
9899

99100
<!--

meta/boardreports/2020-12.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
- Process existing content from pull requests and Google group into our repository
4747
- Evaluate ideas to further facilitate collection of pattern content (e.g. through automation), channel ongoing discussions into pattern-work and attract more contributors, e.g. by lowering the barriers of entry for them.
4848
- Onboard further trusted committers
49-
- Review the current list of trusted committers. Some of them don’t seem to be active anymore and likely receive a lot of github notifcations and emails from us that they don't need. (do we have an offboarding process for TCs?)
49+
- Review the current list of trusted committers. Some of them don’t seem to be active anymore and likely receive a lot of github notifications and emails from us that they don't need. (do we have an offboarding process for TCs?)
5050
- Level up some patterns to higher maturity levels. e.g. the [InnerSource Portal](https://github.com/InnerSourceCommons/InnerSourcePatterns/blob/master/patterns/2-structured/innersource-portal.md) has multiple known instances and even a reference implementation now, so it could be brought to maturity "Validated" relatively easily.
5151

5252
## Last Committer Addition

meta/boardreports/2021-01.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@
6060
- Level up some patterns to higher maturity levels. e.g. the [InnerSource Portal](https://github.com/InnerSourceCommons/InnerSourcePatterns/blob/master/patterns/2-structured/innersource-portal.md) has multiple known instances and even a reference implementation now, so it could be brought to maturity "Validated" relatively easily.
6161
- Process / Maintenance
6262
- Onboard further trusted committers
63-
- Review the current list of trusted committers. Some of them don’t seem to be active anymore and likely receive a lot of github notifcations and emails from us that they don't need. (do we have an offboarding process for TCs?)
63+
- Review the current list of trusted committers. Some of them don’t seem to be active anymore and likely receive a lot of github notifications and emails from us that they don't need. (do we have an offboarding process for TCs?)
6464
- Process existing content from PRs and Google group into our repository (once that is done we can focus on the contribution process via the GitHub repo exclusively)
6565

6666
## Last Committer Addition

meta/pattern-system.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -78,12 +78,12 @@ our InnerSource pattern system.
7878

7979
Takashi Iba has published an article in the ACM Digital Library from PLoP 2016:
8080
[A pattern language for creating pattern languages: 364 patterns for pattern
81-
mining, writing, and symbolizing](https://dl.acm.org/citation.cfm?id=3158175&CFID=831673585&CFTOKEN=74341142&qualifier=LU1011674)
81+
mining, writing, and symbolizing](https://dl.acm.org/doi/10.5555/3158161.3158175)
8282

8383
- for those without ACM DL access, there is [an earlier draft of the paper from
8484
PLoP 2016](http://www.hillside.net/plop/2016/papers/three/26.3.pdf).
8585

86-
## Candiate Classifications
86+
## Candidate Classifications
8787

8888
This section shall serve to collect individual proposals for systems of ISC
8989
patterns. Contribute away ;)
@@ -196,7 +196,7 @@ talk "InnerSource 101 and The Apache Way"[1] as a way to characterize patterns:
196196
* Community
197197
* Meritocracy
198198

199-
And in addition, this would have some ortogonal techniques to work on building
199+
And in addition, this would have some orthogonal techniques to work on building
200200
a proper transparency (for instance) that could go from the infrastructure to
201201
be used to monitoring the process and produce surveys, training and other
202202
actions.
@@ -244,7 +244,7 @@ potential characterization based on the companies structure?
244244

245245
I like a lot of the other planes suggestions. Wanted to add one more - the point in the lifecycle of the InnerSource project. Does this pattern apply to:
246246

247-
* Pre-launch (prepration to launch) an InnerSource project?
247+
* Pre-launch (preparation to launch) an InnerSource project?
248248
* Launch (initial kick-off)?
249249
* Initial growth?
250250
* Broad adoption?

meta/pattern-template.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,5 +82,5 @@ Though optional, most patterns should list who helped in their creation.
8282

8383
## Alias (optional)
8484

85-
If this pattern is also known under a different name than what is listed unter **Title**, please list those alternative titles here.
85+
If this pattern is also known under a different name than what is listed under **Title**, please list those alternative titles here.
8686
e.g. if the pattern is named after the problem it solves, a helpful alias might be one that describes the solution that is applied.

pattern-categorization/package-lock.json

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

patterns/1-initial/change-the-middle-management-mindset.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ The InnerSource program does not live up to its expectations because middle mana
7171

7272
* Empowering Middle Management - InnerSource readiness checklist; Middle Management should partner with their developers. What are the opportunities out there. Can we come up with justification for you to spend any time on this (how does this tie together with our KPIs)
7373

74-
* If the organzation is doing Agile development, during release planning, time and resources for InnerSource practices should be built into sprints.
74+
* If the organization is doing Agile development, during release planning, time and resources for InnerSource practices should be built into sprints.
7575

7676
* **1 step back, 3 steps forward** (aka "the tax"): If my team contributes, what's the tax (in terms of time/resources)?
7777
* Finding opportunities for contribution

patterns/1-initial/document-architecture-decisions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ Important elements of the solution are:
7171
- How to collect feedback effectively on the ADR/TDR from diverse stakeholders, ensuring a broad range of input.
7272
- How to incorporate the feedback and adjust the ADR/TDR as needed.
7373
- How to move the ADR/TDR towards a conclusion or final decision (e.g., with sign-off from relevant maintainers or decision-makers).
74-
- The use of appropriate tools, considering that non-technical stakeholders may not have direct access to source control or specialized software. Publish the decsions to a website or wiki.
74+
- The use of appropriate tools, considering that non-technical stakeholders may not have direct access to source control or specialized software. Publish the decisions to a website or wiki.
7575
- **A commitment to iterating on the ADR/TDR templates and process**:
7676
- Regularly refining the ADR/TDR templates and associated processes based on feedback and the evolving needs of the organization.
7777

@@ -180,7 +180,7 @@ The ADR/TDR approach also carries risks that a team want to acknowledge:
180180

181181
## Rationale
182182

183-
InnerSource projects that want to achieve high participation rates and make the best possible decisions for everybody involved need to find ways to create participatory format for all system components, tools and workflows. Michael Nygard announced 2011 the idea to document architecture decision with a simple markdown template and shared it with a simple git project. Today this **ADR tool** is well proven and a many of teams around the globe use **Architecture Desicion Records (ADRs)** to document there design desicions.
183+
InnerSource projects that want to achieve high participation rates and make the best possible decisions for everybody involved need to find ways to create participatory format for all system components, tools and workflows. Michael Nygard announced 2011 the idea to document architecture decision with a simple markdown template and shared it with a simple git project. Today this **ADR tool** is well proven and a many of teams around the globe use **Architecture Decision Records (ADRs)** to document there design decisions.
184184

185185
Another important aspect of defining architectural decisions is documenting consequences. In Technical Debt Records, Dr. Michael Stal explores the systematic tracking and management of technical debt in software development using **Technical Debt Records (TDRs)**. Similar to how Architecture Design Records (ADRs) capture architectural decisions, TDRs document trade-offs in code quality made to accelerate delivery. The TDRs provides a detailed template for documenting technical debt, and Christoph Kappel introduces a record tool to streamline the process of ADRs and TDRs.
186186

0 commit comments

Comments
 (0)