Don’t panic when you see a merge conflict! 🚀 In this tutorial, **Beshilo Coding Academy** walks you through the reality of modern software development: merging code from different branches.

We show you exactly what happens when two versions of a file clash and how to use the VS Code Merge Editor to choose between “Current Changes” and “Incoming Changes.” Mastering this workflow is what allows developers to work together on the same project without deleting each other’s work.

**What You’ll Master:**
✅ **Setting Upstream:** Using `git push –set-upstream origin [branch]` for the first push.
✅ **Branch Navigation:** Switching between your feature branch and the `main` branch.
✅ **The Merge Command:** Using `git merge [branch-name]` to bring your features into production.
✅ **Conflict Resolution:** How to identify a merge conflict and use the VS Code editor to fix it.
✅ **Team Logic:** Understanding how multiple developers contribute to a single repository.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – The Upstream Error: How to Push a New Branch for the First Time
00:15 – Using the `git push –set-upstream` Shortcut
00:43 – Switching Back to the Main Branch
01:03 – Comparing Files: How File Visibility Changes with Branches
01:45 – Preparing the Main Branch for a Merge
02:02 – Running `git merge`: What Happens When Branches Combine?
02:06 – **Merge Conflict!** Why It Happens and What It Looks Like
02:22 – Resolving Conflicts: Accept Current vs. Incoming vs. Both Changes
02:35 – Summary: Why Branching is the Key to Teamwork

—–

### **Resources & Links**

🔗 VS Code Merge Conflict Guide: https://code.visualstudio.com/docs/editor/versioncontrol#_merge-conflicts
🔗 Git Merge Documentation: https://git-scm.com/docs/git-merge

**Master the Prerequisite Skills:**
📺 [How to Delete a Git Branch & Manage Feature Work](https://studio.youtube.com/video/vissjOFswNM)
📺 [Git & GitHub Full Course for Beginners | Zero to Hero](https://studio.youtube.com/video/T_Js1IIOhUs)

—–

### **About Beshilo Coding Academy**

Conflict resolution is a superpower in software engineering. We break down the complex parts of the Git ecosystem so you can focus on building amazing apps. Subscribe for more expert developer training!

#GitMerge #MergeConflict #GitHub #CodingForBeginners #VSCode #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #VersionControl #ProgrammingTutorial

Master your TypeScript project setup by understanding the tsconfig.json file!

In this lesson, we break down how to tell TypeScript exactly how to compile your code, where your source files live (rootDir), and where your final JavaScript should go (outDir). Whether you’re a beginner or looking to refine your dev workflow, mastering these compiler options is essential for clean, bug-free code.

⚡ Key Concepts Covered:
• What the tsconfig.json file actually does
• Setting rootDir and outDir to keep code organized
• Enabling strict type checking for production safety
• Creating a clean project structure (src/index.ts – – dist/index.js)
• Target JS versions & module selection

⏱️ Timestamps:
00:00 – Introduction to tsconfig.json
00:15 – Setting rootDir and outDir
00:47 – Type Checking & Compiler Options
01:11 – Target JS Versions & Node.js Modules
01:38 – Creating Project Structure (src/index.ts)
02:22 – Generating Markdown Project Structure

—————————————————
🔔 Subscribe to Beshilo Coding Academy for full-stack software engineering tutorials!
#TypeScript #JavaScript #WebDevelopment #Programming #VSCode #BeshiloCodingAcademy

“Cannot delete branch ‘login’ because you are checked out on it.” 🚀 If you’ve seen this error, this video is for you! **Beshilo Coding Academy** explains the rules of Git branch deletion and how to properly sync your project.

We also walk through a full feature-branch workflow—from creating a `register` page to pushing that specific branch to GitHub. This is essential for anyone wanting to keep their project structure clean and professional.

**What You’ll Master:**
✅ **Branch Deletion:** Why you must switch to the `main` branch before deleting others.
✅ **The Delete Command:** Using `git branch -d [name]` to remove local branches you no longer need.
✅ **Verification:** Using `git branch` to confirm your list is clean.
✅ **Feature Workflow:** Creating a new `register` branch and adding unique content.
✅ **Pushing Branches:** Using `git push` with the upstream suggestion to get your new branch onto GitHub.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – Why You Can’t Delete a Branch You’re Currently Using
00:15 – Recap: The `git switch -c` Shortcut
00:23 – The Fix: Switching to `main` Before Deletion
00:55 – `git branch -d`: Deleting the Login Branch Successfully
01:15 – Verifying Your Clean Branch List
01:25 – Practical Exercise: Creating a New `register` Feature Branch
01:45 – Modifying Files and Tracking “Version 2” Changes
02:05 – Staging and Committing Your Feature Work
02:15 – Pushing a New Branch to GitHub (Upstream Command)

—–

### **Resources & Links**

🔗 Git Documentation (Branching): https://git-scm.com/docs/git-branch
🔗 My GitHub Profile: [Your Link Here]

**Level Up Your Git Skills:**
📺 [How to Create & Switch Branches in One Step](https://studio.youtube.com/video/ndp9AgMydhg)
📺 [Git Fetch vs. Git Pull Explained](https://studio.youtube.com/video/KSze7Soe3fA)

—–

### **About Beshilo Coding Academy**

We help you avoid common pitfalls so you can focus on building great software. Deleting old branches and managing features is a key part of “Git Hygiene.” Subscribe for more professional development tips!

#GitTutorial #CodingForBeginners #GitHub #GitBranch #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #ProgrammingTutorial #VersionControl #TerminalCommands

Speed up your Git workflow! 🚀 In this tutorial, **Beshilo Coding Academy** shows you the professional way to handle branches.

Instead of the slow process of creating a branch and then switching to it manually, we reveal the “Shortcut Command” that does both instantly. This small change will save you time every single day you’re coding.

**What You’ll Master:**
✅ **Verification Basics:** Using `git log –oneline` and `git branch` to check your status.
✅ **The Standard Way:** Creating a branch with `git branch` and switching with `git switch`.
✅ **The Pro Shortcut:** Using `git switch -c [name]` to create and enter a new branch at the same time.
✅ **Terminal Navigation:** Using `Ctrl + L` vs the `clear` command for a cleaner workspace.
✅ **Branch Identification:** Understanding what the asterisk (*) means in your branch list.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – Checking Project Status & Pushing Final Main Changes
00:18 – Terminal Tip: `Ctrl + L` vs. `clear` Command
00:23 – How to Verify Commit History with `git log –oneline`
00:28 – Checking Your Current Branch: What the Asterisk (*) Means
00:41 – The Two-Step Method: `git branch` followed by `git switch`
01:23 – **The Pro Shortcut:** Creating and Switching with `git switch -c`
02:08 – Verifying Your Location in the New Feature Branch
02:18 – Recap: Best Practices for Branch Management

—–

### **Resources & Links**

🔗 Git Cheat Sheet: https://education.github.com/git-cheat-sheet-education.pdf
🔗 Download Git Bash: https://git-scm.com/downloads

**Master the Rest of the Workflow:**
📺 [Git Fetch vs. Git Pull: Understanding Remote Changes](https://studio.youtube.com/video/KSze7Soe3fA)
📺 [Git & GitHub Full Course for Beginners | Zero to Hero](https://studio.youtube.com/video/T_Js1IIOhUs)

—–

### **About Beshilo Coding Academy**

Our mission is to help you work smarter, not harder. By mastering these terminal shortcuts, you’re building the muscle memory of a senior software engineer. Subscribe for more efficiency tips and coding tutorials!

#GitShortcuts #GitHub #CodingForBeginners #GitSwitch #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #VersionControl #TerminalHacks #ProgrammingTips

What’s the difference between fetching and pulling? 🚀 In this lesson, **Beshilo Coding Academy** explains how to manage changes between your local machine and your remote GitHub repository.

We break down the professional developer cycle and introduce advanced topics like resolving merge conflicts and managing feature branches. If you want to work on a team, understanding how to “sync” code without breaking your project is a non-negotiable skill.

**What You’ll Master:**
✅ **The Sync Cycle:** Understanding `git fetch` (downloading without merging) vs. `git pull` (download and merge).
✅ **The Standard Workflow:** A recap of Clone – Edit – Status – Commit – Push.
✅ **Branching Strategy:** How to create feature branches and prepare for a merge.
✅ **Merge Conflicts:** A preview of how to identify and resolve code clashes.
✅ **Clean Workspace:** Using `clear` and `rm -rf` to maintain your project environment.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – Recap: The Standard Git Developer Workflow
00:18 – Example: Staging and Committing `index.html`
00:35 – Step-by-Step: From Cloning to Pushing to Origin
00:58 – Git Fetch: Downloading Changes Without Merging
01:06 – Git Pull: Downloading and Auto-Merging Remote Data
01:15 – Coming Up: Branching, Merging, and Conflict Resolution
01:45 – Practice: Setting Up a New Feature Folder Structure
02:12 – Creating a Log: Modifying Files for a Feature Branch
02:24 – Finalizing the Cycle: Status, Commit, and Push

—–

### **Resources & Links**

🔗 Git Fetch vs Pull Documentation: https://git-scm.com/docs/git-pull
🔗 Join the Full Course: [Your Link Here]

**Advanced Git Tutorials:**
📺 [Master Git Branches: Create, Switch & Manage](https://studio.youtube.com/video/Vb72RJMGnRw)
📺 [How to Fix GitHub Authentication Errors](https://studio.youtube.com/video/E_KOCwyzO0k)

—–

### **About Beshilo Coding Academy**

Our goal is to take you from a hobbyist to a professional contributor. Mastering the “Fetch and Pull” logic is key to working with other developers on GitHub. Subscribe for more intermediate and advanced coding guides!

#GitPull #GitFetch #GitHubTutorial #CodingForBeginners #VersionControl #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #GitMerge #ProgrammingTips

Stop working on your `main` branch! 🚀 In this tutorial, **Beshilo Coding Academy** introduces you to one of the most powerful features of Git: **Branching**.

Learning how to create separate branches allows you to experiment with new features or fix bugs without affecting your stable project. This is the exact workflow used by professional engineering teams at companies like Google and Meta.

**What You’ll Master:**
✅ **The Concept of Branching:** Why we use branches to separate “Main” code from “Feature” code.
✅ **Creating Branches:** Using `git branch [name]` to start a new line of development.
✅ **Navigating Branches:** How to use `git checkout` to move between different versions of your project.
✅ **Visualization:** Using the `git branch` command to see a list of all your active branches.
✅ **Safety First:** How to verify which branch you are currently working on before making changes.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – Introduction to Git Branching
00:15 – Why You Should Never Code Directly on the Main Branch
00:41 – How to Check Your Current Branches using `git branch`
01:03 – Creating Your First Feature Branch: `git branch [name]`
01:25 – Switching Between Branches: The `git checkout` Command
01:45 – Verifying Your Location: How to Know Which Branch is Active
02:10 – Working on a Feature: Modifying Files in a Separate Branch
02:32 – Preparing for the Next Step: Merging Branches

—–

### **Resources & Links**

🔗 Git Branching Documentation: https://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
🔗 Visualizing Git Branches (Tool): https://learngitbranching.js.org/

**Complete the Workflow:**
📺 [How to Rename & Move Files in Git | git mv Tutorial](https://studio.youtube.com/video/dSqbao8rNu0)
📺 [Git & GitHub Full Course for Beginners | Zero to Hero](https://studio.youtube.com/video/T_Js1IIOhUs)

—–

### **About Beshilo Coding Academy**

We specialize in teaching the workflows that get you hired. Mastering branches is the first step toward working on large-scale open-source projects and professional dev teams. Subscribe to continue your journey!

#GitBranching #GitHub #CodingForBeginners #VersionControl #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #GitTutorial #ProgrammingRoadmap #GitCheckout

Don’t break your Git history by renaming files manually! 🚀 In this tutorial, **Beshilo Coding Academy** explains how to use the `git mv` command to rename and move files while keeping your version control history intact.

We walk through real-world examples, like changing a `register.js` file to `login.js`, and how to handle file extensions (like `.py` to `.css`) directly from the terminal. This is a crucial skill for maintaining a clean and professional repository.

**What You’ll Master:**
✅ **The `git mv` Command:** Why you should use it instead of your computer’s standard rename.
✅ **File Renaming:** Step-by-step guide to changing file names without losing track of changes.
✅ **Directory Management:** Moving files between folders while staying under Git control.
✅ **Verification:** Using `ls` to confirm name changes and checking the status of your “tracked” files.
✅ **Pushing Updates:** Committing and pushing your renamed files to GitHub.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – Why Manual Renaming Breaks Git Tracking
00:15 – Committing Existing Files Before Renaming
00:30 – Using the `git mv` Command to Rename Files
00:50 – Verifying Changes: `ls` vs. Original File Names
01:03 – Practical Example: Renaming Extensions (.py to .css)
01:25 – Moving Files into Folders via Terminal
01:52 – Finalizing Changes: Staging, Committing & Pushing
02:18 – Troubleshooting: Ensuring Your Files are Properly Tracked
02:35 – Summary: Best Practices for File Management in Git

—–

### **Resources & Links**

🔗 Git Documentation (git mv): https://git-scm.com/docs/git-mv
🔗 Download Git Bash: https://git-scm.com/downloads

**Master the Rest of the Workflow:**
📺 [Daily Git Workflow: How to Update Files & Push Changes](https://studio.youtube.com/video/Yn6mb0TK4_w)
📺 [Git & GitHub Full Course for Beginners | Zero to Hero](https://studio.youtube.com/video/T_Js1IIOhUs)

—–

### **About Beshilo Coding Academy**

We help you master the “hidden” commands of Git that separate beginners from pros. By learning how to manage your project structure correctly, you’re building better software. Subscribe for more deep dives into developer tools!

#GitTutorial #CodingForBeginners #GitMv #ProgrammingTutorial #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #VersionControl #TerminalCommands #GitHubTips

Once your project is live, how do you update it? 🚀 In this video, **Beshilo Coding Academy** breaks down the essential daily cycle of a software developer: modifying code and syncing those changes with GitHub.

We dive deep into the terminal to show you exactly how to track changes, interpret `git status` messages, and package your work into meaningful commits. This is the foundation of professional version control.

**What You’ll Master:**
✅ **Tracking Changes:** Using `git status` to identify modified (M) and new files.
✅ **The Staging Step:** Why we use `git add` before committing.
✅ **Commit Best Practices:** How to write a commit message that explains your progress.
✅ **The Final Sync:** Using `git push` to update your remote GitHub repository.
✅ **Verification:** Confirming your updates are live on the GitHub web interface.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – The Daily Developer Workflow: An Overview
00:15 – Modifying Files in VS Code & Terminal
00:27 – Using `git status` to See Your Progress
00:43 – Staging Your Changes: `git add .` Explained
01:05 – Creating a Commit: Saving a Snapshot of Your Code
01:28 – `git push`: Sending Local Updates to GitHub
01:48 – Refreshing the GitHub UI to Verify Changes
02:12 – Repeating the Cycle: Making Further Modifications
02:35 – Summary: Status, Add, Commit, Push

—–

### **Resources & Links**

🔗 My GitHub Profile: [Your GitHub Link]
🔗 Git Cheat Sheet: https://education.github.com/git-cheat-sheet-education.pdf

**Master the Basics First:**
📺 [How to Install Git & Create a GitHub Account](https://studio.youtube.com/video/UqCRxrO9y-Y)
📺 [How to Fix GitHub Authentication & Authorize Git Credential Manager](https://studio.youtube.com/video/E_KOCwyzO0k)

—–

### **About Beshilo Coding Academy**

Our mission is to make you industry-ready. By mastering the Git workflow, you are learning the #1 tool used by engineering teams worldwide. Subscribe to level up your dev skills!

#GitWorkflow #GitHub #CodingForBeginners #GitPush #ProgrammingTutorial #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #VersionControl #GitStatus

Stuck on the “Authorize Git Ecosystem” screen? 🚀 In this tutorial, **Beshilo Coding Academy** solves one of the biggest headaches for new developers: GitHub Authentication.

We show you exactly how to verify your identity through the browser, authorize the Git Credential Manager, and successfully push your local files to GitHub. Plus, we dive into how to manage modified files directly inside VS Code using the integrated terminal.

**What You’ll Master:**
✅ **Authentication:** How to sign in with your browser and authorize the GitHub Ecosystem.
✅ **The First Push:** Using `git push -u origin main` to sync your local PC with the cloud.
✅ **VS Code Integration:** Opening your project with `code .` and using the integrated terminal.
✅ **File States:** Understanding “Modified” (M) and “Untracked” (U) files in your project.
✅ **Status Verification:** Using `git status` and `git remote -v` to check your connections.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – The Final Step: Pushing Your Project to GitHub
00:26 – Troubleshooting: Managing Multiple GitHub Accounts
00:42 – How to Authorize Git Credential Manager (Browser Sign-in)
01:02 – Success! Refreshing GitHub to See Your Pushed Files
01:22 – Verification Commands: `ls`, `git status` & `git remote -v`
01:58 – VS Code Pro Tip: Opening Projects with `code .`
02:12 – Modifying Files: Understanding the “M” (Modified) Status
02:28 – Adding New Files (Python & HTML) in the Staging Area

—–

### **Resources & Links**

🔗 GitHub Auth Support: https://docs.github.com/en/get-started
🔗 Download VS Code: https://code.visualstudio.com/

**Essential Prerequisite Videos:**
📺 [How to Install Git & Create a GitHub Account](https://studio.youtube.com/video/UqCRxrO9y-Y)
📺 [How to Push Code to GitHub: Local to Remote Repository Guide](https://studio.youtube.com/video/XLkEig_ASEY)

—–

### **About Beshilo Coding Academy**

We help you navigate the tricky parts of the developer workflow. From terminal errors to cloud deployments, we provide the clarity you need to keep coding. Subscribe for more expert guides!

#GitHub #Git #CodingForBeginners #GitPush #VSCode #GitCredentialManager #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #ProgrammingTutorial

Go live with your code! 🚀 In this tutorial, **Beshilo Coding Academy** shows you the exact steps to connect your local Git project to a remote GitHub repository.

We break down the “Three Pillars” of the Git workflow: the Working Directory, the Staging Area, and the Repository. Whether you’re creating a public portfolio or a private project, this guide ensures your code is safely backed up on the cloud.

**What You’ll Master:**
✅ **The Git Workflow:** Understanding the “Packaging” (Staging) step vs. the Working Area.
✅ **GitHub Setup:** How to create a new Public or Private repository.
✅ **The Initial Push:** Using `git init`, `git add`, and `git commit` for the first time.
✅ **Branch Management:** Setting your main branch with `git branch -M main`.
✅ **Remote Connection:** Linking your local PC to GitHub with `git remote add origin`.
✅ **Pushing Code:** Finalizing your upload with `git push -u origin main`.

—–

### **⏱️ CHAPTERS (Exact Timestamps)**

00:00 – The 3 Stages: Working Area, Staging Area, and Repository
00:17 – Understanding the “Packaging” Step (Staging Area)
00:43 – Creating a New GitHub Repository (Public vs. Private)
01:25 – How to Use the `README.md` Command
01:52 – Your First Commit: Saving Your Progress Locally
02:02 – Renaming Your Main Branch for GitHub Compatibility
02:12 – Connecting Local Git to Your Remote GitHub Link
02:24 – `git push`: How to Upload Your Code for the First Time
02:35 – Summary: What to Use for Existing Projects

—–

### **Resources & Links**

🔗 Create a GitHub Repo: https://github.com/new
🔗 Git Documentation: https://git-scm.com/doc

**Next Level Tutorials:**
📺 [Git & GitHub Full Course for Beginners | Zero to Hero](https://studio.youtube.com/video/T_Js1IIOhUs)
📺 [Introduction to TypeScript Modules](https://studio.youtube.com/video/LIkTf8Palik)

—–

### **About Beshilo Coding Academy**

We turn complicated workflows into simple steps. From your first line of code to your first production deployment, we’ve got you covered. Subscribe for more professional developer tutorials!

#GitHub #Git #CodingForBeginners #GitPush #WebDevelopment #SoftwareEngineering #BeshiloCodingAcademy #VersionControl #ProgrammingTutorial #GitTutorial