- Kickstart tutorial
- Must-read tutorial: the concepts of branching and merging note the collaborating link at the bottom
- A branching top-down view
- How to resolve merge conflicts in Git? - Stack Overflow Very good hints below the solution.
- Github's help for merging from commandline
Nguyễn Nhật Nam nhatnam1507
nhatnam1507
/ Awesome_git_cheatsheet.md
Created
July 9, 2022 05:45
— forked from mer0mingian/Awesome_git_cheatsheet.md
How to use `git mergetool` to resolve conflicts
nhatnam1507
/ Makefile
Created
February 21, 2022 17:05
— forked from isaacs/Makefile
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # Hello, and welcome to makefile basics. | |
| # | |
| # You will learn why `make` is so great, and why, despite its "weird" syntax, | |
| # it is actually a highly expressive, efficient, and powerful way to build | |
| # programs. | |
| # | |
| # Once you're done here, go to | |
| # http://www.gnu.org/software/make/manual/make.html | |
| # to learn SOOOO much more. |