Hands-on Demo – Managing Inner Source with Forks

Hands-on Demo – Managing Inner Source with Forks

In this demonstration, we’ll explore how Inner Source can be effectively managed using forks within a Git-based workflow. Forking allows contributors from different teams or departments to work independently on their own copies of a repository while collaborating on shared projects.

Scenario:

Inner Source with Forks

Goal:

Enable cross-team collaboration while maintaining separate, yet connected, repositories for innovation and integration.

Steps to Demonstrate Inner Source with Forks

1. Create a Fork for Collaboration

1. Fork the Repository:

Team A needs to work on a specific feature (e.g., a new reporting dashboard). They create a fork of the main repository:

xxxxxxxxxx
1
1
https://github.com/organization/main-repo.git

and create their fork:

xxxxxxxxxx
1
1
https://github.com/TeamA/forked-repo.git

2. Clone the Fork Locally:

Team A clones their forked repository for feature development:

xxxxxxxxxx
2
1
git clone https://github.com/TeamA/forked-repo.git
2
cd forked-repo

2. Feature Development in the Fork

1. Develop New Feature:

Team A develops the feature (feature-x branch) independently:

xxxxxxxxxx
1
1
git checkout -b feature-x

2. Add Changes:

Work on the changes and commit them:

xxxxxxxxxx
2
1
git add .
2
git commit -m "Added feature X"

3. Push Changes:

Push the changes to the fork:

xxxxxxxxxx
1
1
git push origin feature-x

3. Sharing Changes with Other Teams

1. Pull Request:

Team A creates a pull request (PR) to propose their changes:

xxxxxxxxxx
1
1
git push origin feature-x

This initiates a PR with reviewers from Team B and main repository maintainers.

2. Review and Feedback:

Team B and other collaborators review and provide feedback on the PR.

4. Merging Changes Back to Upstream

1. Merge PR:

Once reviewed and approved, Team A’s changes are merged into the main repository:

xxxxxxxxxx
2
1
git checkout main
2
git merge feature-x

2. Sync Fork:

Team A’s fork is now updated with the latest changes:

xxxxxxxxxx
1
1
git pull upstream main

5. Continuing Collaboration

Ongoing Collaboration:

Teams can continue to create branches, propose changes, and maintain their own forks while contributing to the collective codebase.

Benefits of Inner Source with Forks

1. Isolation: Teams can work independently on features while ensuring minimal disruption to the main repository.

2. Collaboration: PRs and shared reviews allow teams to contribute seamlessly.

3. Version Control: Each team maintains their own version of the codebase, syncing changes only when needed.