BiteSizedChunks.comLearn one small thing at a time.

Course contentsShow

Computer Science

1What is Binary and Why It Matters
2Counting in Binary
3Converting Binary to Decimal
4Converting Decimal to Binary
5Binary Addition
6Binary Subtraction
7Hexadecimal Number System
8Converting Between Binary and Hexadecimal
9Octal Number System
10Signed Integer Representation
11Two's Complement Arithmetic
12Fixed-Point and Floating-Point Basics
13Boolean Values and Truth Tables
14The NOT Gate (Inverter)
15The AND Gate
16The OR Gate
17The XOR Gate (Exclusive OR)
18NAND and NOR Gates
19Boolean Expressions and Laws
20De Morgan's Laws
21Building Complex Circuits from Basic Gates
22Simplifying Boolean Expressions
23What is Character Encoding?
24ASCII: The Foundation
25Extended ASCII and Code Pages
26Unicode: Universal Character Set
27UTF-8 Encoding
28UTF-16 and UTF-32
29Byte Order Marks and Endianness
30Common Encoding Issues

Computer Science

1What is Binary and Why It Matters
2Counting in Binary
3Converting Binary to Decimal
4Converting Decimal to Binary
5Binary Addition
6Binary Subtraction
7Hexadecimal Number System
8Converting Between Binary and Hexadecimal
9Octal Number System
10Signed Integer Representation
11Two's Complement Arithmetic
12Fixed-Point and Floating-Point Basics
13Boolean Values and Truth Tables
14The NOT Gate (Inverter)
15The AND Gate
16The OR Gate
17The XOR Gate (Exclusive OR)
18NAND and NOR Gates
19Boolean Expressions and Laws
20De Morgan's Laws
21Building Complex Circuits from Basic Gates
22Simplifying Boolean Expressions
23What is Character Encoding?
24ASCII: The Foundation
25Extended ASCII and Code Pages
26Unicode: Universal Character Set
27UTF-8 Encoding
28UTF-16 and UTF-32
29Byte Order Marks and Endianness
30Common Encoding Issues

← Computer Science

Lesson 2188 of 2,872·49. Version Control with GitPro lesson

Resolving Merge Conflicts

Master the process of manually resolving conflicts by editing conflict markers and staging resolved files.

This lesson is for subscribers

You've completed the free preview. Subscribe to unlock every lesson in every course.

See pricing Back to course