Skip to main content

Git workflow

This document describes the best practices when working with Capact repositories.

General rules#

Each contributor and maintainer must follow this workflow:

  • Work on forked repositories.
  • Create branches on the fork and avoid working directly on the main branch.

Prepare the fork#

A fork is a copy of the repository from which you raise pull requests to propose changes to the original repository. The contribution workflow that bases on forks allows both the members of the Capact.io organization, and the external contributors to contribute code and content through the same process. This keeps the main repositories clean as contributors create branches only on the forked repositories.

To create the fork, click Fork button in the upper-right corner of the repository's main page.

Fork

Configure the fork#

NOTE: The document refers to the original repository as the upstream repository and to the forked repository as the origin repository.

To make it easy to synchronize the changes from the upstream repository, configure a new Git remote and set the synchronization of the main branch to the new remote.

  1. Clone the fork to your local machine. Use the Code button on the repository's main page to view the command to use.

    Code

  2. Navigate to the location of the cloned repository.

  3. To see the current configured remote repositories, run the following command:

    git remote -v

    The result has the following format:

    origin  https://github.com/{your-username}/{repository}.git (fetch)origin  https://github.com/{your-username}/{repository}.git (push)
  4. Specify a new remote upstream repository to synchronize with the fork:

    git remote add upstream https://github.com/{original-owner}/{original-repository}.git

    For example:

    git remote add upstream https://github.com/capactio/community.git
  5. Disable pushing changes directly to the upstream:

    git remote set-url --push upstream no_push
  6. Fetch all remote branches:

    git fetch --all
  7. Set the local main branch to track the remote main branch from the upstream repository:

    git branch -u upstream/main main

From now on, every time you pull the changes from main branch on the local repository, you refer to the main branch of the upstream repository.

Contribute#

Basic flow#

After you set up your fork, start contributing. Follow these steps:

  1. Check out the main branch.

    git checkout main 
  2. Pull the latest changes:

    git pull 
  3. Create a new branch:

    git checkout -b {branch-name}
  4. Change proper files according to what you want to contribute.

  5. Select changes to commit. To include all changes you made within the repository, use:

    git add -A
  6. Commit changes:

    git commit -m "{your message}"
  7. Push changes to the origin repository:

    git push -u origin {branch-name}
  8. Open a pull request from GitHub UI or CLI.

    • For the pull request title, use the following rules:
      • Include a short description of changes made.
      • Use the imperative mood.
      • Capitalize it.
      • Do not end the subject line with a period.
    • For the pull request description, adhere to the pull request template.

Keep branch up to date#

To keep the branch up to date, execute the set of following commands:

# Update the main branch by pulling all changesgit pull upstream main:main# Reapply your commits one by one on the top of the main branchgit rebase main

In case of any conflicts during the rebase, run:

git rebase --abort

Follow the Rewriting history chapter from the "Pro Git" book to squash your commits into one.

Retry the rebase, resolve all conflicts and continue the rebase with the command:

git rebase --continue