Raspberry Pi 4 GPIO

The commit command prodiced this error:

libgit error (29): unstaged changes exist in workdir

The “sgit push myfork Pi4GPIO” command produced this error:

libgit error (4): cannot push because a reference that you are trying to update on the remote contains commits that are not present locally.

I have changed two files: hdr.BCM2835 and s.GPIO. sgit sees hdr/BCM2835 as “modified” and s.GPIO as “new file”. s/GPIO is always listed as one of the “Changes not staged for commit”.

I don’t know how many checkouts I have (I don’t know how to see them, and each time it has gone wrong I have simply deleted my local HAL_BCM2835 directory and started again).

I’m on the point of giving up.

My changes are visible in git web view (I’m sure they weren’t yesterday), so I’ve requested a merge. I hope I’ve done it right this time.

I’ve committed a revised version of s.GPIO via the git web interface, but I don’t know what damage I’ve done to the repo. I can’t see any way to create a merge request.

I simply cannot cope with git. The instructions I can find never cover the operation I’m trying to do, and git’s error messages are meaningless to me.

Accordingly, if in future I do any dev work on RISC OS itself, I’m just going to email the changes in and let someone else sort it out.