git good with Chris! - resolving merge conflicts

preview_player
Показать описание
Quick and easy way to resolve those pesky conflicts!

We'll get into more indepth examples as we continue the series!
  1. Chris Alexiuk
Рекомендации по теме
git good with 0:35:04

git good with Chris! - what even is a branch?

git good with 0:15:59

git good with Chris! - what is a 'remote'?

git good with 0:21:54

git good with Chris! - git clone

git good with 0:16:55

git good with Chris! - how to do a pull request

git good with 0:22:15

git good with Chris! - git push (push it real good)

git good with 0:08:11

git good with Chris! - git stash all your cares away! (just don't accidentally drop them)

git good with 0:08:20

git good with Chris! - github.com actions: how to enforce linting!

git good with 0:09:28

git good with Chris! - what problem does git solve?

git Good with 0:04:41

git Good with Chris! - how to git pull (simple case)

git good with 0:11:20

git good with Chris! - seeing past our git differences (how to use git diff)

git good with 0:07:38

git good with Chris! - git revert AKA CTRL+Z +++

git Good with 0:02:47

git Good with Chris! - quick hit: how to do a pull request

git good with 0:21:52

git good with Chris! - git init, add, and commit

git good with 0:07:34

git good with Chris! - resolving merge conflicts

git good with 0:14:31

git good with Chris! - real example: syncing a fork to upstream

git good with 0:14:18

git good with Chirs! - what is forking, and why should i do it?

git good with 0:14:28

git good with Chris! - bookeeping: adding SSH key pairs to GitHub!

gitgood with Chris! 0:15:02

gitgood with Chris! - how to git fetch and merge

How to Use 0:13:04

How to Use GitHub

Git Good with 0:46:57

Git Good with Advanced Git

Git and Testing 0:41:43

Git and Testing by Christian Couder

From zero to 0:51:48

From zero to hero VSCode, PSADT and GIT with Chris Gerke

Learn how to 0:14:12

Learn how to contribute to projects using branches and pull request #git #github #beginners

Avoid this Git 0:00:25

Avoid this Git rebase PITFALL!