Git Changes Question

I dared to change AcornHTTP inside Git using Iris.
Entirely unexperienced with Git it ended up in a little desaster (one unnecassary branch, two superflous merge requests). However I assume that
I managed it in the end to load the changed files inside my own master branch and it seems that I created a merge request to merge all related files from there into the regular master branch.

My question is now how to continue. How I am informing a person to perform the merge into the master branch, this means to accept my changes?

Perhaps I did all this entirely wrong. In such a case it would be nice if anyone could tell me how to do it in the right way.

As I understand it you Push your changes to GitHub to a branch, then issue a Pull request to merge your branch with the master. The Pull request will be reviewed by the administrator who will approve the request and make the merge if the changes are acceptable.

1) Join the RiscOS group here, “Request Access”. You’ll have to wait for that to be approved.
2) When it’s approved, go onto your merge request, and put ROOL as assignee in the top right hand corner (not reviewer) on the todo bar.

If you haven’t already, look at “Guidance on a good merge request” at the bottom of this page.

The account was assigned to me by ROOL a year ago.
Until now I didn’t use it. Before I had a limited CVS access so this account is the successor I assume.

Assigning ROOL makes sense but it seems that I can’t assign anyone.

So it ends up in nowhere :-(. It is a bit frustrating.

Ok. I have requested Access to RiscOS group now.
If it should be acknowledged I shall be perhaps able to change an assignee. Lets see.

It may be easier to start again. This is what you have. Fixing it isn’t trivial – at least not for me

* 94b819e (origin/tmilius-master-patch-74790, tmilius-master-patch-74790) Needed to tell module initialization/finalization functions
* 142f5ab (HEAD -> master, origin/master, origin/HEAD) Example UsrMthds file
* 690c98f Description of new User Methods
* a1619e0 Replace start Handling of additional User Methods added
* f3c6bae Replace module Simply initialization/finalization for new structure inside start added
| * c272132 (origin/tmilius-master-patch-04680) Update Docs/AddMethds, Docs/UsrMthds files
|/  
* 9cb08bd (tag: HTTP-1_04) Implement SNI when making secure connections
* 1c9549e (tag: HTTP-1_03) Fix for race condition fetching headers

You should not have committed to master. So origin/master should be at HTTP-1.04.

You should only have 1 commit on your branch.

I see you have 2 branches – one for docs, is that deliberate?

this cheatcheat in wiki is what I follow.

It may be easier to take a copy of your changes, delete your fork from gitlab and start again.

As I wrote: I clicked on the wrong fields on beginning at the Web gui. One branch is entirely superflous. But I didn’t find a way to remove. Perhaps I have to search one or two days.

There is no need to store the changes. Code has been developed by downloading an archive. Then I changed the parts and
testet the new AcornHTTP module. At the end I wanted to provide the source for putting it into mainstream.

On LINUX I am restricted to Raspian and an SD card which is in my opinion not the optimal choice to install Git.
Git on RISC OS caused trouble a while ago on my NAS as an update a while ago destroyed my ISO-Latinfile naming.
One test file in the RISC OS data requires 8 Bit chracters. So Git failed and restarted always at the same point.

May be a couple of people are finding Git very nice. I can’t agree until now.
Perhaps things may change when a good RISC OS client is available but I fear this won’t help in conjunction
with the NAS problem for myself.

Of course I can delete all what I did except the account itself but how (from view of GUI)?

On LINUX I am restricted to Raspian and an SD card which is in my opinion not the optimal choice to install Git.

I run git on a headless orangepipc running armbian. I then connect to the orangepipc from visual studio code on my surface pro which gives a visual git view over ssh. I then compile on my armx6 which is connected to the orangepipc via lanmanfs. So plenty of hoops jumped through

May be a couple of people are finding Git very nice. I can’t agree until now.

I found the learning curve very steep. I had to switch to using a visual gui in visual studio code and compiling over lanmanfs to understand what I was doing.

Of course I can delete all what I did except the account itself but how (from view of GUI)?

To delete your project go to your project page, on the bottom of the menu on the left select ‘Settings→general→advanced’ and ‘Remove fork relationship’ and ‘Delete project’

In general, it’s not necessary to close your merge request and open a new one. Merge requests reference branches; any changes you commit to that branch will automatically be included in the request. So you can add new changes to a merge request just by updating the source branch. (However I can’t really give any advice on editing code via the gitlab web UI since I do all my editing locally)

It may be easier to start again. This is what you have. Fixing it isn’t trivial – at least not for me

For that kind of problem (you’ve committed to the wrong branch), “git reset” is your friend.

# Switch to the branch you want to fix
git checkout master
# Reset it to point to a different commit. "--hard" also updates your working directory.
git reset --hard HTTP-1_04
# Push the change to the remote server, with -f (--force) to get it to directly accept the change instead of trying to do a normal merge or complaining that you're doing something unusual
git push -f

Doing the above from a GUI is left as an exercise to the reader (a fully-fledged git GUI should support it, but I’m not sure about VSCode)

I tried to delete everything as good as possible.
I removed the project as described by Colin.
Then I restarted with CLI instructions as recommended by Julie and Colin.
I created an SSH key and told it to my account.
And at the end I stuck again. This time at

git push -u …

The connection is not accepted however. Perhaps because I am still not registered in the RISC OS Group or
because I didn’t know what to enter as repositiory or perhaps my Raspian isn’t aware about the
new created SSH key or or or …

I meanwhile spent around one day in uploading a couple of file. The changes inside them took me only
a fraction of the time. It is quite frustrating :-(.

I uploaded the files again by making usage of the Web GUI.
I created a new merge request. Of course I still can’t assign the request to a
group member as I am not assigned to the RISCOS group.
At this point I saw that the old requests are still available even the are closed
and Git recognises that the related source has been dropped.

At this point you are probably thinking it’s not worth the effort. In case you are still trying this should work with the gitlab ‘Web IDE’ though I think it would be better to use git on raspian.

So if using the Web IDE on the rool gitlab.

1) fork HTTP
2) When showing ‘Files’ click on the v part of ‘master HTTP/ +v’ to show a menu and click on ‘New Branch’ and name the branch ‘patch’
3) select ‘patch’ as the current branch.
4) click on ‘Web IDE’
5) make all your changes to all files
6) select commit, enter commit message, select commit with ‘Start a new merge request’ ticked
7) Below the description you should have an ‘Assignee’ field that you set to ‘ROOL’

If you make a mistake like making 2 commits or an incorrect message I can’t see a way of fixing it on gitlab.

If ROOL ask you to modify the changes I can’t see that you would be able to do it in the gitlab website.