#Git #SourceTree | How to create new branch, merge code and resolve conflict between branches

preview_player
Показать описание
When you want to start a new feature, you create a branch with git branch, then check it out with git checkout. You can work on multiple features in a single repository by switching between them with git checkout.

00:00 Intro
00:34 How to create a new branch ?
02:02 How to switch to another branch ?
02:50 How to merge changes from a branch ?
04:04 How to resolve conflict when merge from a branch to another branch ?

Please refer to video for basic git command line:
  1. Helen's Hash
  2. Git
  3. Git Branch
  4. Git command
  5. Source Tree
  6. merge branch
Рекомендации по теме
Git with Source 0:14:48

Git with Source Tree | Source Tree Tutorial | Source Tree with git

Git Tutorial 1 0:07:39

Git Tutorial 1 - SourceTree Setup and Overview - Connect SourceTree to Github

Learn Git, Sourcetree 1:03:10

Learn Git, Sourcetree & BitBucket Tutorial: A Crash Course for Beginners

Sourcetree Git Anfänger 0:03:47

Sourcetree Git Anfänger Einführung - Befehle commit, push, pull

How To Use 0:14:40

How To Use GIT and SourceTree - For Beginners

Intro to Git 0:30:02

Intro to Git with SourceTree

How to Use 0:10:29

How to Use Sourcetree for Git Version Control System

Sourcetree Git - 0:01:45

Sourcetree Git - Was ist Git Merge und wie funktioniert das Mergen?

#1 Einfach GIT 0:19:13

#1 Einfach GIT nutzen mit SourceTree ohne die böse Console! [Tutorial]

COMMIT & PUSH 0:12:19

COMMIT & PUSH IN GIT WITH SOURCETREE - Video : 03

#Git #SourceTree | 0:07:16

#Git #SourceTree | How to Reset or Revert code changes on Git with SourceTree

Handling Merge Conflicts 0:06:48

Handling Merge Conflicts with Visual Studio and SourceTree (7 of 9)

Creating your own 0:06:48

Creating your own Branch using SourceTree (6 of 9)

Getting started with 0:07:40

Getting started with Git using SourceTree - Part 1: Version control

Learning Git Tutorial 0:05:35

Learning Git Tutorial | Adding Files To A Repository With SourceTree

Tutorial de GIT 0:16:50

Tutorial de GIT (SourceTree)

How to Set 0:14:46

How to Set Up an Unreal Engine 5 Git Repository - SourceTree Source Control

Git - SourceTree 0:11:12

Git - SourceTree на практике

Getting started with 0:02:37

Getting started with Git using SourceTree - Part 6: Stashing

Using SourceTree to 0:14:50

Using SourceTree to Manage Your Git Projects

git flow with 0:04:58

git flow with sourcetree in 5 minutes

How to use 0:02:46

How to use Cherry Pick in Git (SourceTree)

Git Sourcetree - 0:01:21

Git Sourcetree - Was ist Cherry Picking und wie funktioniert es?

#Git #SourceTree | 0:07:38

#Git #SourceTree | How to create new branch, merge code and resolve conflict between branches

Комментарии
Автор

Thanks for the the video I needed! It's pretty simple if you just right click on the branch you want to checkout under the "Branches" area in the left sidebar.

TheSoulCrisis
Автор

Thanks for making the vid, I had forgotten how to merge branches. At least, I needed to confirm I wasn't about to make a colossal mistake.

destroyonload
Автор

tThank you for your detailed explanation

AlAmin-kpnf
Автор

Thanks for this video. I will try this on my machine now.

hemang
Автор

Please refer to video for basic git command line

helencode
Автор

when I switch back to my main local branch, I get this error saying " Out of memory, realloc failed" . Any help with this please?

sherifmedhat