Discover githubtraining/managing-merge-conflicts Open Source project

Course repo for Learning Lab course "Introduction to GitHub". Template repo ➡️

introduction-to-github

advanced-git

hellogitworld

Hello Git World sample training repository

Course repo for Learning Lab course "Migrating your repository to GitHub".

migrating-your-repository

community-contributors

Helpful docs and information for contributors to our open source Learning Lab courses

looking-glass-action

provides feedback to learners based on the outcome of their validation lab grader workflow

Resources for preparing to, and implementing SAML with GitHub Enterprise.

saml-implementation-prep

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-check-installed-apps

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-use-gitignore

Template repo for Learning Lab course "Introduction to GitHub". Course repo ➡️

caption-this-template

Template repo for github-games. Primary purpose is in-person training. Bugs are intentional so we can fix them together.

github-games

github-actions-for-packages-demo

slideshow-on-pages

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-publish-package

A tutorial to help you make the move to GitHub

github-move

github-pages

Course repo for Learning Lab course "GitHub Pages". Template repo ➡️

example-submodule

This repository contains several commits of a single project file as a simple example used in conjunction with submodules.

A repo that is a submodule with a few commits and release tags

example-dependency

Course repo for GitHub Actions: Writing JavaScript actions

write-javascript-actions

example-githubapiscripts

Collection of scripts to practice working with the API

A very simple repo to demonstrate rebasing with "rebase onto"

example-rebase-orphan-branch

intro-html-demo

CSS

example-rebase--onto

hello-github-actions

Course repo for GitHub Actions: Hello World on Learning Lab

intro-to-html

Course repo for Learning Lab course "Introduction to HTML". Template repo ➡️

Course repo for Learning Lab course GitHub Actions: Using GitHub Script

write-github-script

looking-glass-payload-tester

action to quickly test Looking Glass behavior when altering payload data

Course repo for Learning Lab course "Write a Learning Lab course".

write-a-ll-course

innersource-theory

Training manual for InnerSource for Leaders and InnerSource for Teams

exercise-use-secrets

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-remove-commit-history

Course repo for Learning Lab course "Introduction to React".

react-course

write-docker-actions

Course repo for Learning Lab course: GitHub Actions: Write Docker container actions

security-strategy-essentials-demo

Course repo for Learning Lab course "Securing your workflows". Template repo ➡

security

merge-conflicts-demo

Course repo for Learning Lab course "Communicating using Markdown". Template repo ➡

oss-enterprise-demo

communicating-using-markdown

learning-lab-boilerplate

This repository is a boilerplate for Learning Lab courses.

three-ducks

Template repository for Codeland 2019

example-bisect

Course repo for Learning Lab course "Security strategy essentials"

security-strategy-essentials

pin-me

A place to make your very first open source contribution (or your 1,000th - everyone is welcome)

This repository is the source for the Learning Lab course, GitHub Actions: Continuous Delivery

continuous-delivery-aws

exercise-reference-a-codeql-query

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-enable-github-pages

Course repository for "GitHub Actions: Continuous Integration"

using-github-actions-for-ci

ci-circle

Course repo for Learning Lab course "Continuous Integration with CircleCI". Template repo ➡

github-pages-with-jekyll-template

Template repo for Learning Lab course "GitHub Pages". Course repo ➡️

exercise-exclude-files-from-secret-scanning

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

Groovy programming language example with shell script build

example-groovy

A general purpose repository template with some starter issue and PR templates and workflows

repository-template

example-maven

A Maven-built Java example

Template repo for Learning Lab course "Introduction to React"

react-template

Template repository for GitHub Actions: Continuous Delivery with Azure

continuous-delivery-azure-template

TEMPLATE: Octocat captioning activity for training

caption-this

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-configure-codeql-language-matrix

The Learning Lab course path for becoming an open source enterprise.

become-an-open-source-enterprise

innersource

Course repo for Learning Lab course "InnerSource Fundamentals". Template repo ➡️

using-github-actions-for-ci-template

The template repository for Learning Lab course on GitHub Actions: Continuous Integration

A playable post on how harmless choices can make a harmful world with merge conflicts built in for git practice.

conflict-practice

Solution repo for the react course

react-solution

Template repo for Learning Lab course "Introduction to HTML". Course repo ➡️

intro-to-html-template

example-filter-branch

example of filtering a branch to remove a large binary asset commit

connect-the-dots-in-a-github-repository

This course is meant to teach skills for working in a larger, older repository with others.

first-day-on-github

The Learning Lab learning path for your first day on GitHub.

merge-conflict-template-repo

Template repo for Learning Lab course "Managing merge conflicts". Course repo ➡️

Template repo for Learning Lab course "Continuous Integration with CircleCI". Course repo ➡️

ci-circle-template

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-configure-dependabot

Course repo for Learning Lab course "introduction-to-github-apps". Template repo ➡️

introduction-to-github-apps

create-a-college-notebook

Let's create a college notebook

github-games-template

🔍📖 Find things in strings of markdown.

markdown-finder

Course repo for Learning Lab course "Uploading your project to GitHub".

uploading-your-local-project

design-thinking-intro

This course will teach you the principles of Design Thinking.

filterbranch-example

Shell

example-html-proofer

A template repository for Project 4: Advanced Commands

project-four-advanced-commands

example-basic

This repository has just 5 basic commits on master by three different coders, providing a basic commit structure for learning exploring Git commands.

CSS

community-starter-kit-template

Template repo for Learning Lab course "Community Starter Kit"

example-rerere

This repository contains two near-identical branches for merging and exploring Reuse Recorded Resolution.

CSS

create-a-college-notebook-template

The template repository for the Create a college notebook course on Learning Lab.

express-template

The Learning Lab course path for DevOps with GitHub Actions.

devops-with-github-actions

security-template

Template repo for Learning Lab course "Securing your workflows". Course repo ➡

The Learning Lab course path for ramping up on Git and GitHub.

plumbing-workshop

ramp-up-on-git-and-github

education-actions

Repo to hold GitHub Actions used in Learning Lab course authoring

Shell

protected-branches-codeowners-template

lab-starter-template

assessment-push-actions

example-gradle

A Gradle-built Java example

Prepare for the GitHub foundational certification with this learning path.

certification-path

configuring-kubernetes-kubectl-in-an-actions-workflow-template

The template repository for the Configuring Kubernetes kubectl in an Actions Workflow course on Learning Lab.

example-ruby

Example ruby application for working with CI and Git and GitHub

A hands-on exercise using GitHub Actions. See README.md for instructions on how to get started.

exercise-scheduled-events