Skip to content

Instantly share code, notes, and snippets.

@tarasowski
Created February 7, 2024 11:21
Show Gist options
  • Save tarasowski/748874c7ae8ed0d391aeb64c10c9b752 to your computer and use it in GitHub Desktop.
Save tarasowski/748874c7ae8ed0d391aeb64c10c9b752 to your computer and use it in GitHub Desktop.
Let my mates fix the issues

Here's a step-by-step breakdown:

  1. Your teammate will first fetch the changes from the remote repository to ensure they have the latest code.

    git fetch origin
  2. They will then create a new branch based on your feature branch.

    git checkout -b fix/issue origin/your-feature-branch
  3. They will make the necessary changes in this new branch and commit them.

    git add .
    git commit -m "Fix the issue"
  4. After committing the changes, they will push this new branch to the remote repository.

    git push origin fix/issue
  5. They will then create a new pull request in the repository, proposing to merge the fix/issue branch into your your-feature-branch.

  6. Once the pull request is reviewed and approved, it can be merged into your feature branch. You can then pull these changes into your local copy of the feature branch.

    git checkout your-feature-branch
    git pull origin your-feature-branch

This workflow ensures that your feature branch is updated with the fixes made by your teammate.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment