NUS Hackers Wiki
NUS Hackers Wiki
  • NUS Hackers Wiki
  • Hackerschool
    • Virtual Machines and Linux
    • Beginners' Guide to the Terminal
      • Introduction to the Terminal
      • Modern Shell Tools
      • Shell Scripting
      • Real World Scripting
      • Resources
    • Self-Hosting: Three Easy Pieces
      • 1. Setting up your server
      • 2. Running Services
      • 3. Monitoring your server
    • Vim
    • Introduction to Zig
      • Language Basics
      • Error Handling
      • Memory Management
      • Working with C
      • Exploring comptime
    • CI/CD with Github Actions
      • Background
      • Basics of Github Actions
        • Target workflow
        • Running unit tests
        • Linting code
        • Deploying to Github Pages
      • Advanced use cases
        • Pollers
        • Github script
        • Executing third-party scripts
        • Reusable workflows
      • Cookbook
    • Lightning Git
      • Git Concepts
      • Getting Started with Git
      • Making your first commit
      • Branching
      • Merge Conflicts
      • Integrating remote repositories
      • Collaborative Workflows
      • Commit Manipulation and Reflog
      • Interactive rebasing
      • filter-repo
  • Orbital
    • JavaScript
      • Browser Developer Tools
      • Getting Started
      • Datatypes
      • Operators and Operations
      • Loops and Conditions
      • Functions
      • Strings
      • Arrays
      • HTML
        • Getting Started
        • Tag Attributes
        • HTML Forms
        • Browser Inspector
      • CSS
        • Selectors
        • Colors in CSS
        • Measurements in CSS
        • The Box Model
        • Adding Styles - Part 1
        • Adding Styles - Part 2
      • Working with the DOM
        • Querying the DOM - Selectors
        • Querying the DOM - Element Attributes
        • Querying the DOM - Element Styles
        • Events with JS and HTML
        • Exercise: Click Counter
        • Editing the DOM
        • Fetch Requests
        • Exercise: The NUSMods API
    • React
    • React Native
      • Setup
      • Intro to JSX
      • Basic Syntax
      • Handling UI
      • Props
      • State Management
    • Git
      • Setup
      • Command Glossary
      • Fundamental Concepts
        • Getting Started
        • Integrating Remote Repositories
        • Branching
        • Merge Conflicts
      • Collaborative Workflows
        • Fork and PR Workflow
        • Branch and PR Workflow
      • Advanced Concepts
        • Ignoring Files
        • Commit Message Conventions
        • Github Collaborators
        • CI/CD with Github Actions
        • Advanced Git Commands
      • FAQ
    • Telegram Bot
      • Creating a TeleBot
      • API Calls
      • Telebot Basics
      • Integrating API's
    • Relational Database
      • Database Overview
      • Database Design
      • Entity Relationship Diagram
      • SQL Basics & PostgreSQL
Powered by GitBook
On this page
  • Using this guide
  • Why this guide?
  • Where can I find the slides?
  • Changelog
Edit on GitHub
Export as PDF
  1. Orbital

Git

PreviousState ManagementNextSetup

Last updated 6 days ago

This guide aims to progressively introduce various concepts necessary to start using Git to manage your project.

Using this guide

Before starting the guide, it is highly recommended that you give Setup a read to ensure that everything you need for this guide is correctly setup.

We also highly recommend that you read Fundamental Concepts to understand the terminologies that this guide uses.

The guide is broken up into three parts:

  1. Fundamental concepts

  2. Collaborative workflows

  3. Advanced concepts

The first two parts are the most important and we highly recommend that you, at the very least, finish them. The last part is good to know but not crucial if you are in a rush.

If you encounter a command with <text> format, you are to replace <text> with your own.

Why this guide?

This guide was created as an effort by to make knowledge easily available for various technical topics!

Where can I find the slides?

The slides are published here:

Changelog

  1. 11 May 2024: First draft for first 2 sections

  2. 18 May 2024: Conducting the workshop for Orbital 2024

NUS Hackers
https://github.com/nushackers/hackertools_materials/blob/main/git/slides.pdf