Chore: Sync develop and main branches (Feb 2025)

[joelabreo227]

@SH4LIN reported that the develop and main branches are out of sync, and the development workflow is messed up because of this. He will be syncing the two shortly.

Related chore:

• Create DEVELOPMENT.md or similar file w/ updated instructions post sync
  • Add link to https://github.com/rtCamp/login-with-google?tab=readme-ov-file#contribute

[SH4LIN]

I have manually checked the differences between the plugin files to identify any major changes in the develop branch that were never merged into the master branch. There are none.

For future development, we need to synchronize the master and develop branches.

Current status of the develop branch:

• 23 commits ahead of master
• 47 commits behind master

To align both branches, we can reset the develop branch to match the master branch. However, this will erase the commit history of the develop branch.

Workflow after synchronization

Branching Strategy

• master → Always holds stable, production-ready code.
• develop → Main branch for ongoing development.
• feature/xyz → Used for new features and bug fixes.
• release/x.y.z → Prepares a new version for release.
• hotfix/x.y.z → Fixes critical bugs in master.

New Feature Development

1. Branch off from develop:

   git checkout develop
   git pull origin develop
   git checkout -b feature/new-feature

2. Work on the feature and commit changes.
3. Merge back into develop via a PR.

Preparing for a New Release

1. When develop is stable, create a release branch:

   git checkout develop
   git pull origin develop
   git checkout -b release/1.2.0

2. Test and finalize changes.
3. Merge into master and tag the release:

   git checkout master
   git merge release/1.2.0
   git tag -a v1.2.0 -m "Release 1.2.0"
   git push origin master --tags

Fixing Bugs After a Release

1. Create a hotfix/1.2.1 branch from master for urgent fixes:

   git checkout master
   git pull origin master
   git checkout -b hotfix/1.2.1

2. Apply fixes and merge back into master and develop to keep both in sync.

I'll add this workflow to development.md as well.

[SH4LIN]

I have also created a develop-backup branch to preserve the commit history before resetting the develop branch.

Here is the link to that branch: [develop-backup](https://github.com/rtCamp/login-with-google/tree/develop-backup).

[SH4LIN]

Develop and master commit history are synced.