Today, we're collaborating with another dev using Git Ace. We'll be learning all about pulling changes, resolving conflicts and merging. Enjoy:) [ Video Outline ] Merge - Only An Issue If The Same File Is Changed - Can Modify File & Mark As Resolve - Can Resolve Using 'Mine' or 'Theirs' - The Merged Changes Will Have To Be Committed Git Commands - Fetch & Pull - Pulling Will Invoke The Fetch Commands Standard Git Process - Stage - Commit - Pull - Merge (if required) f required) - Push [ Info ] Email ~ ****** Music ~ [Verm - Explode] ****** Subscribe ~ ****** Playlist ~ ****** Share Video ~ ****** Channel Files ~ ******