Skip to content

Commit

Permalink
Merge branch 'main' into rem-duplicate-electron
Browse files Browse the repository at this point in the history
  • Loading branch information
YUUU23 committed Jun 28, 2024
2 parents 6d56331 + b32ad90 commit e0bc29c
Showing 1 changed file with 5 additions and 17 deletions.
22 changes: 5 additions & 17 deletions docs/further_reading/version_control.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -16,30 +16,18 @@ Git is a version control system that enables you to track changes to files. With

Nearly all operations that are performed by Git are in your local computing environment, with the exception of a few used to synchronize with the GitHub remote host. Some of the most common git operations are depicted below.

<img
src={gitBasics}
alt="Git basics"
/>
<img src={gitBasics} alt="Git basics" />

If you would like to make any changes to current repository, it is always good to start with creating a feature branch, where you can save all the changes.

<img
src={gitBranch}
alt="Example branches diagram"
/>
<img src={gitBranch} alt="Example branches diagram" />

## Create a Pull Request

Pull requests are useful before you merge your branch with the main branch. You can request a review from your colleagues and check for any conflicts with the main branch. After you pushed all the changes to your branch, you can go to the original GitHub repository and click on the pull request.

<img
src={createPR}
alt="Create a pull request"
/>
<img
src={addReviewers}
alt="Add reviewers to a pull request"
/>
<img src={createPR} alt="Create a pull request" />
<img src={addReviewers} alt="Add reviewers to a pull request" />

## Best Practices

Expand Down Expand Up @@ -113,7 +101,7 @@ Honeycomb is an active project, and will be updated with new features over time.
3. Merge the current Honeycomb repo

```shell
git merge honeycomb/main --allow-unrelated histories
git merge honeycomb/main --allow-unrelated-histories
```

:::caution
Expand Down

0 comments on commit e0bc29c

Please sign in to comment.