git conflicts with rebase and merge

Git rebase/merge conflicts In this lesson we will examine the conflicts we are getting when using git rebase and git merge. In many cases developers are struggling with many conflicts when using git rebase. In this lesson we will discuss why there are so many conflicts in rebase, how to reduce those conflicts, and in general how to work properly with git rebase. We will also compare working with merge or rebase in terms of conflicts. In addition we will examine how merge and rebase are working when running a git pull command. By default git pull will work with merge, we can add a flag –rebase to the git pull command or configure our git to pull using rebase. Another lesson that relates to this lesson is about cleaning you commits. So it’s also recommended to view this lesson: https://www.youtube.com/watch?v=bZpiVijzd2g Regarding how git works with working directory, staging area, local and remote repository, we used in the lecture an image that was taken from this article: https://dvmhn07.medium.com/streamlining-development-leveraging-remote-repositories-in-git-6af0a942e439 The full lesson and step by step guide is available at: https://www.academeez.com/courses/git/rebase-conflicts 0:00 Introduction - rebase/merge and conflicts 0:51 What is git merge? 3:46 git merge example 9:58 conflicts in merge 11:47 merge commit 17:13 What is git rebase? 20:41 git rebase example 32:00 conflicts comparison between merge and rebase 34:27 git docs about rebase interactive 38:05 clean feature branch before rebase 43:19 Messy feature branch 48:20 git pull 53:59 git pull example 59:19 git pull example with rebase 1:06:42 Summary