Materials/References:
Kdiff3 merging tool:
- GitHub Code:
-- Configure Kdiff3 tool with git on windows
#################
git config --global --add merge.tool kdiff3
git config --global --add mergetool.kdiff3.path "/Applications/kdiff3.app/Contents/MacOS/kdiff3"
git config --global --add mergetool.kdiff3.trustExitCode false

git config --global --add diff.guitool kdiff3
git config --global --add difftool.kdiff3.path "/Applications/kdiff3.app/Contents/MacOS/kdiff3"
git config --global --add difftool.kdiff3.trustExitCode false
####################################



Support Me | ادعمنا
pattreon: https://patreon.com/issamabdelnabi
buymeacoffee: https://www.buymeacoffee.com/abdelnabi

Find Me Here:

Facebook Profile: https://www.facebook.com/issam.ab/
Metigator Facebook Page: https://www.facebook.com/metigator.net
LinkedIn Profile: https://www.linkedin.com/in/issam-abdelnabi-5214b360/
Twitter: https://twitter.com/IssamAbdelnabi
Github: https://github.com/metigator

Support Me | ادعمنا
pattreon: https://patreon.com/issamabdelnabi
buymeacoffee: https://www.buymeacoffee.com/abdelnabi

⏱️ Timestamps:

00:00​ Intro | مقدمة
00:47 Introduction to branching
06:46 Demo Description
09:07 Git Commit under the hood
18:58 create branch
26:08 Fast Forward Merging
35:17 3-ways merging strategy (ORT)
42:18 Resolving merging conflicts (manual)
53:47 Resolving Merging conflict using kdiff3 tool



▷ Playlists on our channel:
Mastering C#: https://youtube.com/playlist?list=PL4n1Qos4Tb6SWPbJNpiznp-Ok4A8J_23l
SQL Server & Database: https://youtube.com/playlist?list=PL4n1Qos4Tb6RP_OovpgjoHLkCVaYFy-aj
Design Principles: https://youtube.com/playlist?list=PL4n1Qos4Tb6ThSyydEJTm7xJ3qEwE8Oyu
LINQ: https://youtube.com/playlist?list=PL4n1Qos4Tb6Sj1Y4xJuJoWCuqleeG2yt6
Code To go: https://youtube.com/playlist?list=PL4n1Qos4Tb6Qtt7r6noiIO-9-FjHCxKw5
UML: https://youtube.com/playlist?list=PL4n1Qos4Tb6Q_IMy-JkIHXJMUH1djd7IX
GIT/Github: https://youtube.com/playlist?list=PL4n1Qos4Tb6R4guGC4oX_PZVt8E8XpvqE
Unit Testing: https://youtube.com/playlist?list=PL4n1Qos4Tb6RrQpmpGWALaE1PVvWR8d3A
Vs Code & dotnet CLI: https://youtube.com/playlist?list=PL4n1Qos4Tb6Q9HT7F7D7IRB_qyNwHL-EV
EF Core: https://youtube.com/playlist?list=PL4n1Qos4Tb6QZkbTWJx7wHqEABP8Pg6uv
Design Patterns: https://youtube.com/playlist?list=PL4n1Qos4Tb6QZkbTWJx7wHqEABP8Pg6uv
Kubernetes: https://youtube.com/playlist?list=PL4n1Qos4Tb6Q7C9x91INiNSFrdeUxLGJj
ASPNET Core: https://youtube.com/playlist?list=PL4n1Qos4Tb6S-uLNUmrgCJiQXfXi5KjRJ
AGILE: https://youtube.com/playlist?list=PL4n1Qos4Tb6QgXH5U6m_Zg4M_SGcJoHOA
DEVOPS: https://youtube.com/playlist?list=PL4n1Qos4Tb6TBTTmt9Hmol3dboWEJrDXW
Angular: https://youtube.com/playlist?list=PL4n1Qos4Tb6RyOJmok7hnDxI6PGpyAKi-
Docker: https://youtube.com/playlist?list=PL4n1Qos4Tb6SmxUz3JpM4VcCb36f3iKjW
Logging Tracing and Monitoring: https://youtube.com/playlist?list=PL4n1Qos4Tb6RpP6QhqSizsWDqFJpbidc3









#metigator #youtube #dotnetcore #csharp #programming #issam_abdelnabi #عصام_عبد_النبي