Git SCM on BWRGY

Initial Setup

Mon, 01 Jan 0001 00:00:00 +0000

Install Git

Linux

# For CentOS/RHEL
sudo yum install git

# For Debian/Ubuntu
sudo apt install git

macOS (Homebrew)

brew install git

Windows
- Download Git from the official website:
  https://git-scm.com/downloads or click here: Git
Verify Installation

git --version

VS Code Setup for Gitlab

Git integration is built into VS Code.

Install GitLab Extension

Go to Extensions (Ctrl+Shift+X / Cmd+Shift+X).
Search for GitLab Workflow.
Click Install.

Set Git User

git init

git config --global user.name "Your Name"

git config --global user.email "your_email@example.com"

SSH Authentication Setup

1. Generate SSH Key

ssh-keygen -t ed25519 -C "your_email@example.com"

Replace with your GitLab email address.

2. Save SSH_KEY

When prompted to “Enter a file in which to save the key,” press Enter. This will save the key to the default location or specify a custom one.

Workflow Guide

Mon, 01 Jan 0001 00:00:00 +0000

Visual Representation

Here is a simple visual representation of the Git workflow:

git add –> git commit –> git push

1. Working Directory

The working directory is where you create and modify your files. This is the starting point of the Git workflow.

2. Staging Area

The staging area is where you prepare your files for the next commit. You can think of it as a temporary holding area for your files before they are committed to the local repository.

Merge and Rebase

Mon, 01 Jan 0001 00:00:00 +0000

Core Strategy

Rebase: Use when bringing changes from main into your feature branch

Merge: Use when integrating your feature branch into main (via MR/PR)

Aspect	Rebase	Merge
History	Linear, clean	Preserves branching context
Command	`git rebase origin/main`	`git merge feature-branch`
Conflicts	Resolve per commit	Resolve once
Force Push	Required after rebase	Not needed
Team Impact	Changes commit hashes	Safe for shared branches
Best For	Keeping feature current	Final integration

Example Scenario

Initial State

You create a feature branch from commit F, then make several commits while main continues to evolve:

Git Commands

Mon, 01 Jan 0001 00:00:00 +0000

1. Getting Started

Git init

This command is used to initialize a new git repository or to add an existing repository to a new directory. Transform the current directory into a Git repository. This adds a .git subdirectory to the current directory and makes it possible to start recording revisions of the project.

# It creates a new .git subdirectory in the current working directory
git init

Git config

A convenient way to set configuration options for your Git installation. You’ll typically only need to use this immediately after installing Git on a new development machine.