conflict-files-obsidian-git

Conflicts

Please resolve them and commit them using the commands Git: Commit all changes followed by Git: Push (This file will automatically be deleted before commit) Additional Instructions available below file list

• Not a file: content/Andy Wright.md
• Not a file: content/Archibald Grimke.md
• Not a file: content/Ben Jealous.md
• Not a file: content/Categories/People/Anita Belnavis.md
• Not a file: content/Categories/People/Beyonce.md
• Not a file: content/Categories/People/Cedella Marley.md
• Not a file: content/Categories/People/Cindy Breakspeare.md
• Not a file: content/Categories/People/Julian Ricardo Marley.md
• Not a file: content/Categories/People/Karen Marley.md
• Not a file: content/Categories/People/Robert Marley.md
• Not a file: content/Categories/People/Sharon Marley.md
• Not a file: content/Categories/People/Stephanie Marley.md
• Not a file: content/Categories/People/Stephen Marley.md
• Not a file: content/Categories/People/Ziggy Marley.md
• Not a file: content/Charles Buchanan.md
• Not a file: content/Charlie Weems.md
• Not a file: content/Clarence Norris.md
• Not a file: content/Cornell William Brooks.md
• Not a file: content/D W Griffith.md
• Not a file: content/Damian Robert Nesta Marley.md
• Not a file: content/Eric Mays.md
• Not a file: content/Eugene Williams.md
• Not a file: content/Florence Kelley.md
• Not a file: content/Frances Blascoer.md
• Not a file: content/George Wallace.md
• Not a file: content/Haywood Patterson.md
• Not a file: content/Henry Moskowitz.md
• Not a file: content/John E Milholland.md
• Not a file: content/Ky-Mani Marley.md
• Not a file: content/Lillian Wade.md
• Not a file: content/Lorraine Miller.md
• Not a file: content/Maggie Walker.md
• Not a file: content/Mary Talbert.md
• Not a file: content/Maya Wiley.md
• Not a file: content/Moorfield Storey.md
• Not a file: content/Olen Montgomery.md
• Not a file: content/Oswald Garrison Villard.md
• Not a file: content/Ozie Powell.md
• Not a file: content/Rohan Marley.md
• Not a file: content/Roslyn Brock.md
• Not a file: content/Roy Wright.md
• Not a file: content/Ruby Bates.md
• Not a file: content/Samuel Leibowitz.md
• Not a file: content/Victoria Price.md
• Not a file: content/Walter F. White.md
• Not a file: content/William Barber II.md
• Not a file: content/William English Walling.md
• Not a file: content/William Logan.md
• Not a file: content/William Warley.md
• Not a file: content/Willie Roberson.md

Additional Instructions

I strongly recommend to use “Source mode” for viewing the conflicted files. For simple conflicts, in each file listed above replace every occurrence of the following text blocks with the desired text.

<<<<<<< HEAD
    File changes in local repository
=======
    File changes in remote repository
>>>>>>> origin/main