Compare commits

...

3 Commits

Author SHA1 Message Date
Othmane Ataallah
6010b96146 add git-operations-in-the-command-line
All checks were successful
Deploy triz-docs to civital server / build-and-deploy (push) Successful in 1h8m30s
2026-04-29 09:46:33 +01:00
Othmane Ataallah
d8c9c815f4 add git-operations-in-jetbrains-ides 2026-04-29 09:22:52 +01:00
Othmane Ataallah
e139ffba24 add git-operations-in-netbeans 2026-04-29 09:11:37 +01:00
51 changed files with 435 additions and 0 deletions

View File

@ -0,0 +1,8 @@
{
"label": "Git Operations",
"position": 3,
"link": {
"type": "generated-index",
"description": "Guides for performing Git operations using various tools and environments."
}
}

View File

@ -0,0 +1,8 @@
{
"label": "Command-Line",
"position": 3,
"link": {
"type": "generated-index",
"description": "Guide for performing Git operations using the command-line interface."
}
}

View File

@ -0,0 +1,48 @@
---
sidebar_position: 2
title: "Add & Commit Changes"
---
# Add & Commit Changes
---
# Add Changes
## Objective
Select modified files and place them into the staging area before committing.
## Steps
1. Modify one or more files in the project.
2. In the terminal, check the status of the repository: `git status`
![Git Status](img/2.png)
3. Add files to the staging area: `git add .`
![Git Add](img/3.png)
4. Verify that files are staged: `git status`
![Git Status Staged](img/4.png)
---
# Commit Changes
## Objective
Save local changes to the local Git repository.
## Steps
1. Ensure files are staged.
2. Enter the commit command with a message: `git commit -m "Your commit message"`
![Git Commit](img/5.png)
3. Verify the commit: `git log --oneline`
![Git Log](img/6.png)

Binary file not shown.

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 115 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 162 KiB

View File

@ -0,0 +1,16 @@
---
sidebar_position: 1
title: "Prerequisites"
---
# Prerequisites
---
## Steps
1. Install Git on the system.
2. Open a terminal or command prompt.
3. Navigate to the project directory that is already connected to a Git repository.
![Terminal Window](img/1.png)

View File

@ -0,0 +1,37 @@
---
sidebar_position: 3
title: "Push & Pull Changes"
---
# Push & Pull Changes
---
# Push Changes
## Objective
Send committed changes from the local repository to the remote repository.
## Steps
1. Ensure at least one commit exists locally.
2. Execute the push command: `git push`
![Git Push](img/7.png)
---
# Pull Changes
## Objective
Retrieve updates from the remote repository and merge them into the local repository.
## Steps
1. Execute the pull command: `git pull`
![Git Pull](img/8.png)
2. Review the output for updates or merge results.

View File

@ -0,0 +1,8 @@
{
"label": "JetBrains IDEs",
"position": 2,
"link": {
"type": "generated-index",
"description": "Step-by-step guide for Git operations within JetBrains IDEs (IntelliJ IDEA, WebStorm, PyCharm, etc.)."
}
}

View File

@ -0,0 +1,58 @@
---
sidebar_position: 2
title: "Add & Commit Changes"
---
# Add & Commit Changes
---
# Add Changes
## Objective
Select modified files and place them into the staging area before committing.
## Steps
1. Modify one or more files in the project.
![Modified Files](img/2.png)
2. Open the **Commit** window using one of the following methods:
1. Click the **Commit** icon in the left toolbar
2. Or press: **Ctrl + K**
![Opening Commit Window](img/3.png)
3. The Commit window opens.
![JetBrains Commit Window](img/4.png)
4. Select the files to stage using the checkboxes.
5. Ensure the files appear in the **Changes** section.
![Selected Files](img/5.png)
---
# Commit Changes
## Objective
Save local changes to the local Git repository.
## Steps
1. Ensure files are staged.
2. Enter a commit message in the **Commit Message** field.
3. Click the **Commit** button.
![JetBrains Commit Button](img/6.png)
4. After a successful commit, you should get the following notification.
![Commit Notification](img/7.png)
**NOTES:**
- There is no way to change or verify the committer's name in JetBrains IDEs, you must do so via the command line.

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.1 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 32 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 15 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 40 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

View File

@ -0,0 +1,15 @@
---
sidebar_position: 1
title: "Prerequisites"
---
# Prerequisites
## Steps
1. Open a JetBrains IDE.
2. Open the project that is already connected to a Git repository.
3. Ensure the project appears in the **Project** panel.
4. Ensure Git integration is enabled.
![JetBrains Project Panel](img/1.png)

View File

@ -0,0 +1,52 @@
---
sidebar_position: 3
title: "Push & Pull Changes"
---
# Push & Pull Changes
---
# Push Changes
## Objective
Send committed changes from the local repository to the remote repository.
## Steps
1. Use one of the following methods:
1. Click: **Git → Push**
2. Or press: **Ctrl + Shift + K**
![Git Push Menu](img/8.png)
2. Verify the remote repository and branch then click the **Push** button.
![Push Dialog](img/9.png)
3. After a successful push, you should get the following notification.
![Push Notification](img/10.png)
---
# Pull Changes
## Objective
Retrieve updates from the remote repository and merge them into the local repository.
## Steps
1. Click: **Git → Pull**
![Git Pull Menu](img/11.png)
2. Verify the remote branch then click **Pull**.
![Pull Dialog](img/12.png)
3. After a successful pull, you should get the following notification.
![Pull Notification](img/13.png)

View File

@ -0,0 +1,8 @@
{
"label": "Apache NetBeans",
"position": 1,
"link": {
"type": "generated-index",
"description": "Step-by-step guide for Git operations within the Apache NetBeans IDE."
}
}

View File

@ -0,0 +1,53 @@
---
sidebar_position: 2
title: "Add & Commit Changes"
---
# Add & Commit Changes
---
# Add Changes
## Objective
Select modified files and place them into the staging area before committing.
## Steps
1. Modify one or more files in the project.
![Modified Files](img/2.png)
2. Right-click the project or file.
3. Select: **Git → Add**
![Git Add Menu](img/3.png)
4. Click the **Add** button.
---
# Commit Changes
## Objective
Save local changes to the local Git repository.
## Steps
1. Modify one or more files in the project.
![Modified Files for Commit](img/4.png)
2. Rightclick the project or file.
3. Select: **Git → Commit**
![Git Commit Menu](img/5.png)
4. The Commit dialog window opens.
5. Review the list of modified files.
6. Enter a commit message in the **Commit Message** field.
7. Click the **Commit** button.
![Commit Dialog](img/6.png)

Binary file not shown.

After

Width:  |  Height:  |  Size: 36 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 30 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 26 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 31 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 28 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 22 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 21 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 42 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 48 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

View File

@ -0,0 +1,14 @@
---
sidebar_position: 1
title: "Prerequisites"
---
# Prerequisites
## Steps
1. Open NetBeans.
2. Open the project that is already connected to a Git repository.
3. Ensure the project appears in the **Projects** window.
![NetBeans Projects Window](img/1.png)

View File

@ -0,0 +1,89 @@
---
sidebar_position: 3
title: "Push & Pull Changes"
---
# Push & Pull Changes
---
# Push Changes
## Objective
Send committed changes from the local repository to the remote repository.
## Steps
1. Ensure at least one commit exists locally.
2. Rightclick the project.
3. Select: **Git → Remote → Push**
![Git Push Menu](img/7.png)
4. The Push dialog window opens.
5. Verify the remote repository then click **Next**.
![Push Dialog Step 1](img/8.png)
6. Verify the local branches then click **Next**.
![Push Dialog Step 2](img/9.png)
7. Click the remote branches then click **Finish**.
![Push Dialog Step 3](img/10.png)
---
# Push Changes (Upstream)
## Objective
Send committed changes from the local repository to the remote repository.
## Steps
1. Ensure at least one commit exists locally.
2. Rightclick the project.
3. Select: **Git → Remote → Push to Upstream**
![Push to Upstream](img/11.png)
---
# Pull Changes
## Objective
Retrieve updates from the remote repository and merge them into the local repository.
## Steps
1. Rightclick the project.
2. Select: **Git → Remote → Pull**
![Git Pull Menu](img/12.png)
3. Verify the remote repository then click **Next**.
![Pull Dialog Step 1](img/13.png)
4. Verify the remote branches then click **Next**.
![Pull Dialog Step 2](img/14.png)
---
# Pull Changes (Upstream)
## Objective
Retrieve updates from the remote repository and merge them into the local repository.
## Steps
1. Rightclick the project.
2. Select: **Git → Remote → Pull from Upstream**
![Pull from Upstream](img/15.png)

View File

@ -164,6 +164,21 @@ h1 {
margin-top: 2.5rem;
}
.markdown img {
display: block;
margin: 2.5rem auto;
border-radius: 0.75rem;
box-shadow: 0 12px 40px var(--tt-glow-color);
border: 1px solid var(--tt-border-color);
max-width: 100%;
height: auto;
transition: transform 0.3s ease;
}
.markdown img:hover {
transform: scale(1.01);
}
/* Tables */
table {
display: table;

View File

@ -18,6 +18,12 @@ const categories = [
description: 'Our standard development workflow — from task assignment through branching, rebasing, and merging.',
link: '/docs/category/developer-task-workflow',
},
{
title: 'Git Operations',
icon: '🐙',
description: 'Master Git operations across different tools like Apache NetBeans, JetBrains IDEs, and the Command-Line.',
link: '/docs/category/git-operations',
},
];
function CategoryCard({title, icon, description, link}) {