mishmanners/resolve-merge-conflicts-jul22stream mishmanners/resolve-merge-conflicts-jul22stream

  • Stars
    star
    1
  • Language
  • License
    Creative Commons ...
  • Created about 2 years ago
  • Updated about 2 years ago
Twitter logo Share LinkedIn logo Share Facebook logo Share
mishmanners/resolve-merge-conflicts-jul22stream
github

mishmanners

Reviews

There are no reviews yet. Be the first to send feedback to the community and the maintainers!

Repository Details

Why conflicts happen, and how to resolve them. Live streamed 14 July 2022.

More Repositories

1

MishManners

150
star
2

stream-deck-template

Template for the Elgato Stream Deck's standby screen/screensaver.
45
star
3

Free-Learning-Content

Lots of links to online resources, and information about these sites.
36
star
4

GitHub-Like-A-Boss

Repo for demoing live content
JavaScript
30
star
5

TalksandEvents

๐Ÿ“š Resources from the talks that Mish does
22
star
6

LEGO-Unity

LEGO Unity Microgame Dev
C#
18
star
7

mish-friendly-food

App for providing dietary requirements ๐Ÿ on cute cards in different languages
Astro
12
star
8

reviewing-a-pull-request

HTML
5
star
9

Twilio-Quest-JavaScript

JavaScript files for completing Twilio Quest
JavaScript
4
star
10

starter-snake-python

A simple Battlesnake written in Python.
Python
4
star
11

github-actions-for-ci

JavaScript
4
star
12

Travel

A repository for travel tips, tricks, and advice
3
star
13

Unity-Project

Project on Unity. Starting basic, all the files will be stored here.
C#
3
star
14

reviewing-a-pull-request-1

HTML
2
star
15

stl-files

STL files used for 3D printing
2
star
16

battlesnake-starter-csharp

A simple Battlesnake written in C#. https://play.battlesnake.com
C#
2
star
17

introgh

2
star
18

GGJ-snakes

Global Game Jam project for the 2024 hackathon.
C#
2
star
19

VUE-JS-Course

Code for the Vue Mastery Course
Vue
2
star
20

dotnetmona

C#
2
star
21

github-actions-continuous-delivery

JavaScript
2
star
22

security-strategy-essentials

JavaScript
2
star
23

continuous-integration-circle

Ruby
2
star
24

github-slideshow3

A robot powered training repository ๐Ÿค–
HTML
1
star
25

security-on-github

JavaScript
1
star
26

merge-conflicts

HTML
1
star
27

getting-started-github-apps

1
star
28

LIFX-Streaming

Python code used to program LIFX lights for use with stream deck
Python
1
star
29

Python-Twilio-Quest

Python code for Twilio Quest Challenges
Python
1
star
30

PubImages

1
star
31

JediTraining

Python
1
star
32

github-pages-with-jekyll

1
star
33

python-random-quote

A file-based quote bot written in Python
Python
1
star
34

github-slideshow1

A robot powered training repository ๐Ÿค–
HTML
1
star
35

intro-actions

Shell
1
star
36

merge-conflicts-1

HTML
1
star
37

github-slideshow

A robot powered training repository ๐Ÿค–
HTML
1
star
38

github-slideshow2

A robot powered training repository ๐Ÿค–
HTML
1
star
39

dwn-server

DWN server - host anywhere publicly accessible for DIDs to use
TypeScript
1
star
40

Potato

Now I have forked a potato.
Java
1
star