I am a new git user.
I’m simply trying to add 1 schematic symbol to the MCU_SiliconLabs.kicad_sym file.
I had a clean MR at one point but when the librarians got around to trying to merge my add it now fails.
I believe it has something to do with the upgrade to V8. So I updated to V8 and tweaked the symbol slightly so it would rewrite it.
Then I get more errors in the |!4289|
I tried to rebase and had to redo the same edit over and over, I pulled and rebased several times assuming I would eventually catch up. But after 2 hours of doing the same thing over and over it seems I’m not making any progress.
I’m happy to help but I honestly cannot figure out what I’m doing wrong. Probably something simple. I’ve read and re-read the git docs multiple times but clearly I’m missing some tiny aspect.
Please review the MR, the errors and guide me exactly the git commands I need to perform to complete this MR.
TIA,
Eric