Issue with 'git push' after initializing the project

[mjkmain]

Checklist

• I have read and accepted the contributing guidelines.

How did you create the site?

Built from jekyll-theme-chirpy

Description

I've recently forked and cloned your project and am encountering an issue when trying to push changes to my repository. I followed the guidelines provided on the site: https://chirpy.cotes.page/posts/getting-started/.

After successfully running bash tools/init and initializing the project, I attempted to push to the master branch of my forked repository, but received a non-fast-forward error.

Here's the exact command I used and the error message:

mjkim@mlp-server:~/mjkmain.github.io$ git push origin master
To https://github.com/mjkmain/mjkmain.github.io.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/mjkmain/mjkmain.github.io.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

I understand this usually indicates that the local branch is behind its remote counterpart. However, I'm unsure how to proceed since I have just cloned the repository and haven't made any changes other than the initial setup.

Could you please advise on how to resolve this issue? Any guidance or suggestions you could offer would be greatly appreciated.

Thank you for your time and assistance.

Operations you have already tried

git config pull.rebase true
git config pull.rebase false
git config pull.ff only
git push origin master

Anything else?

mjkim@mlp-server:~/mjkmain.github.io$ bash tools/init 
HEAD is now at 60836af chore(release): 6.3.1
npm WARN deprecated @babel/[email protected]: This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-class-properties instead.

added 400 packages, and audited 401 packages in 21s

67 packages are looking for funding
  run `npm fund` for details

found 0 vulnerabilities

> [email protected] prebuild
> npx rimraf assets/js/dist


> [email protected] build
> NODE_ENV=production npx rollup -c --bundleConfigAsCjs


_javascript/commons.js → assets/js/dist/commons.min.js...
created assets/js/dist/commons.min.js in 1s

_javascript/home.js → assets/js/dist/home.min.js...
created assets/js/dist/home.min.js in 636ms

_javascript/categories.js → assets/js/dist/categories.min.js...
created assets/js/dist/categories.min.js in 596ms

_javascript/page.js → assets/js/dist/page.min.js...
created assets/js/dist/page.min.js in 606ms

_javascript/post.js → assets/js/dist/post.min.js...
created assets/js/dist/post.min.js in 588ms

_javascript/misc.js → assets/js/dist/misc.min.js...
created assets/js/dist/misc.min.js in 532ms

[INFO] Initialization successful!

mjkim@mlp-server:~/mjkmain.github.io$ bundle
Fetching gem metadata from https://rubygems.org/..........
Resolving dependencies...
Bundle complete! 6 Gemfile dependencies, 47 gems now installed.
Use `bundle info [gemname]` to see where a bundled gem is installed.
1 installed gem you directly depend on is looking for funding.
  Run `bundle fund` for details


mjkim@mlp-server:~/mjkmain.github.io$ git push origin master
To https://github.com/mjkmain/mjkmain.github.io.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/mjkmain/mjkmain.github.io.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.


mjkim@mlp-server:~/mjkmain.github.io$ git pull origin master
From https://github.com/mjkmain/mjkmain.github.io
 * branch            master     -> FETCH_HEAD
hint: You have divergent branches and need to specify how to reconcile them.
hint: You can do so by running one of the following commands sometime before
hint: your next pull:
hint: 
hint:   git config pull.rebase false  # merge (the default strategy)
hint:   git config pull.rebase true   # rebase
hint:   git config pull.ff only       # fast-forward only
hint: 
hint: You can replace "git config" with "git config --global" to set a default
hint: preference for all repositories. You can also pass --rebase, --no-rebase,
hint: or --ff-only on the command line to override the configured default per
hint: invocation.
fatal: Need to specify how to reconcile divergent branches.


mjkim@mlp-server:~/mjkmain.github.io$ git push origin master
To https://github.com/mjkmain/mjkmain.github.io.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/mjkmain/mjkmain.github.io.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.


mjkim@mlp-server:~/mjkmain.github.io$ git push
To https://github.com/mjkmain/mjkmain.github.io.git
 ! [rejected]        master -> master (non-fast-forward)
error: failed to push some refs to 'https://github.com/mjkmain/mjkmain.github.io.git'
hint: Updates were rejected because the tip of your current branch is behind
hint: its remote counterpart. Integrate the remote changes (e.g.
hint: 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.

[cotes2020]

Try this:

git push -f

[mjkmain]

Thank you!