GitLab forks

I just tried to submit some improvements to Maestro, and failed to create a Fork in GitLab (there’s no button visible in the Project Details screen). It looks like the project is currently protected. Does this mean that submissions have all been frozen, ready for the stable OS release? Or have I got something wrong at this end?

Gah – me being stupid. Just got logged out and didn’t notice.

The fork button looks like it’s working for me. And although I wouldn’t put it past GitLab to be doing something silly, there’s no reason why it should block forking of repositories during a code freeze (you’re reading from the source repo, not writing to it!)

Are you sure you didn’t miss the button? It’s near the top-right of the page, next to the “Star” button & notification settings bell.

Sorry, me being stupid. I’ve submitted the Merge request now, though I noticed that not all the files seem to have made it – the revised Sprites and Templates didn’t get added for some reason. Is there an easy way to add these?

Right, they seem to be there now. Phew!

Since this a merge request, I’d generally go with the approach of amending your current commit to add the missing files. So you’d do either:

1. git add <files>
2. git commit —amend
3. git push -f

Or:

1. git commit -a —amend
2. git push -f

That’ll update your existing commit to contain the missing files (or whatever other changes you might want to make), and then force-push it to the server (a regular push won’t work because you’ve “rewritten history” by amending the old commit)

(git-etiquette note: if you were pushing to a branch which other people are using directly, rewriting history and force-pushing is generally inadvisable, because it can make it difficult for other people to pull those changes)

Right, they seem to be there now. Phew!

Hmm, I should make a note to wait longer before starting to reply to your git-related questions ;-)

Glad you got it sorted!

Thanks Jeffrey. I went with the first of those. It looks like all’s in order now, as far as I can see.

Noted on the etiquette. Hopefully Maestro is obscure enough that no one else is likely to want to meddle with it :)