- …
Original video by Philomatics:
What I wish I had known when I started using git.
0:00 - Aborting the merge
0:26 - Understanding conflict markers
1:30 - Automatic merge options
2:38 - Doing a manual merge
3:36 - Understanding complex conflicts
4:09 - Adding the resolved files
4:32 - Completing the merge
LEGAL DISCLAIMER
▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀
Everything here is for informational purposes only. All non-licensed clips used for fair use commentary, criticism, and educational purposes. See Hosseinzadeh v. Klein, 276 F.Supp.3d 34 (S.D.N.Y. 2017); Equals Three, LLC v. Jukin Media, Inc., 139 F. Supp. 3d 1094 (C.D. Cal. 2015).