Goals
- $ git checkout -b feature Switched to a new branch 'feature' You created some commits in your branch, you want to set the tracking branch to be master. $ git branch -u origin/master Branch 'feature' set up to track remote branch 'master' from 'origin'. You successfully set the upstream branch for your existing local branch.
- Why renaming Git’s master branch is a terrible idea. Back in May (in the inauspicious year of 2020) a thread in the Git mailing list with the tile of “ rename offensive terminology (master) ” was started, it lasted for more than a month, and after hundreds of replies, no clear ground was gained. The project took the path of least.
- To learn to resolve merging conflicts
01 Merge the master branch with style
Let us go back to the style branch and merge it with a new master branch.
Run:
Master Github
Result:
Master Gita
If you open the lib/hello.html you will see:
File: lib/hello.html
Here is the link to join this course — GitHub Ultimate: Master Git and GitHub — Beginner to Expert Overall, a fantastic course to cover Git in depth. It has got, on average, 4.4 ratings from. In Git, 'master' is a naming convention for a branch. After cloning (downloading) a project from a remote server, the resulting local repository has a single local branch: the so-called 'master' branch. This means that 'master' can be seen as a repository's 'default' branch. The Git Cheat Sheet.
The first section is the version of the current branch (style) head. The second section is the version of master branch.
02 Resolution of the conflict
You need to resolve the conflict manually. Make changes to lib/hello.html to achieve the following result.
File: lib/hello.html
Master Github
03 Make a commit of conflict resolution
Run:
Result:
Master Github Rename
04 Advanced Merging
Git has no graphical merging tools, but it will accept any third-party merge tool (read more about such tools on StackOverflow.)