help release

[weigo87]

@skellytz

I need help. I think v3 is now ready to be released.
I started a pull request but it shows me problems?????
Should we make the v3 branch as master?

Then another one please. Can we drop the EET from the BGGOEET and just call the mod BGGO. I think that will save us some confusion.
I hope that fits so everything for a release?

Thanks a lot

[ALIENQuake]

Hi,

Regarding BGGOEET >BGGO:

• if you are talking about mod name change BGGOEET.tp2 > BGGO.tp2 then it's fine, you can do this using git mv command
• I'm not sure if you want to do this as part of the current PR or create a separate change only for renaming
• the repository name can't be easily changed because it will break PI auto-update system.

[ALIENQuake]

Regarding conflict:
Swapping branch names is not something I recommend. It's not required to handle conflicts/etc

The conflict that you are seeing is a very simple one:

• the .gitignore file from v3-beta branch: https://github.com/SpellholdStudios/BGGOEET/blob/v3-beta/.gitignore
• the .gitignore file from the master branch has different content: https://github.com/SpellholdStudios/BGGOEET/blob/master/.gitignore

All you need to do is:

• open https://github.com/SpellholdStudios/BGGOEET/pull/6/conflicts
• pay attention to <<<<<<< v3-beta (begin of the file) ======= and >>>>>>> master (end of the file) (those are git-related, not weidu-related)
• edit the file directly on the web interface and make it so it has all lines from master + an extra line from v3-beta branch (
  the line with *.bak is already present in the master)
• remove <<<<<<< v3-beta, ======= and >>>>>>> master
• at the top-right, the "Mark as resolved" button should become active, click it
• conflict should be solved, and a new commit should be created, it now should be possible to merge PR

Do you want to try it? If not, I can handle this.

[weigo87]

Thanks for the help with the conflict. I solved it with your super tutorial :)

the repository name can't be easily changed because it will break PI auto-update system

But that's what we would have to do, since BGGO is no longer just for EET. The BGT variant has never been designated as such.
However, I do not know how the PI auto-update system works. Was that not also for all engine variants or only for the EE variant?

[ALIENQuake]

PR was merged. Don't forget to pull changes into your local repository and switch to the master branch before you continue to do extra work.

I understand that the repository URL doesn't reflect the supported games for this mod. PI auto-update system doesn't diverge between EE or classic, it cares only about the repository URL that is written inside ini file:
Download = https://github.com/SpellholdStudios/BGGO
Keeping the old repository URL seems to be a minor annoyance when compared to the inability of users to update the mod via PI. right now, there is no way to handle such 'repository rename' for players that already downloaded this mod via PI. I've reverted the URL change inside ini until there was an idea of how to move forward.

[ALIENQuake]

However, I do not know how the PI auto-update system works.

Everything you need to know is here: https://github.com/ALIENQuake/ProjectInfinity/wiki/Delta-Updates-for-mods-hosted-at-Github

[weigo87]

The question is, how many are using the old BGGOEET version that has never worked properly? There were always graphic errors.
Or is it easier to start a completely new repo and let the BGGOEET disappear into oblivion?
Of course it is not my intention to complicate your project and bring it into difficulties. If there is really no other way, we can leave it already.

But anyway thanks for your help.

[ALIENQuake]

Perhaps you're right. A new repo might be a good choice to indicate that 'this is a new mod, it actually works this time'. If you want to do it and you need admin rights (you will have write rights by default) for this new repository, you need to do a 'trick' or wait until @GwendolyneFreddy is back. If that's not necessary, just create a new repo (remember to edit bggo.ini again).

Creating a new repository is also an occasion for removing unnecessary 'git binary data' at the cost of losing previous git history. Start with the mod files + .github folder for the new repo and it will save ~700MB of blobs. I'm not sure if this is a huge benefit but not everyone in the world has a high-speed internet connection so maybe it's worth it.