Read the statement by Michael Teeuw here.
Config option with array of multiple values?
-
I think I’ve managed to thoroughly muck things up. Apparently my changes are in a branch called “master” and the repository has a “main” and never the twain shall meet.
If I go to the “pull requests” tab in github, it shows me the differences between the file there and my changed file but there’s no way to merge them. This is what I’m seeing:
I have the module working for me on my system but I don’t seem to be able to get it to a state where I can publish it.
I’ve never used git/github before (other than to download modules) and, frankly, there’s a lot of base knowledge I don’t have that seems to be required to understand it and get it working.
-
@UncleRoger ok
ok, the easiest way to handle this
rename your module folder to some other name
then git clone your github repo
then copy the files from your renamed folder to the clone
then in the clone folder do
git add . git commit -m "adding 1st commit" git push
then the local branch will be the same as the remote(github) branch
and all will be well from then on, and u can delete the renamed folder -
@UncleRoger well, maybe its even easier
on the github page
the link next to the branches
you can rename main to xyz
then rename master to main
then delete xyz branchthen on your pc
rename the existing folder out of the way
git clone your repo again
then you will be in sync -
@sdetweil
I went with your first suggestion and it seems to be all better now.I’m going to play with it some more but once I’m satisfied it won’t break anyone’s set up too badly, do I just change the visibility from private to public?
There was a notice about the repository not being protected but it seems to have gone away; is that something I should worry about?
Lastly, I see this on the repository page:
Do I need to do anything about those?Thanks again for all your help and your patience!
-
@UncleRoger just change it to public. the others are for bigger projects
-
@sdetweil Thanks!
-
@MZ-BER
FYI, I’ve published and posted in the modules/showcase forum.