[Ovmsdev] Need some git school

Stephen Casner casner at acm.org
Wed Mar 17 04:34:08 HKT 2021

I haven't gotten any traction on my request for people to test the
updated mongoose-wolfssl branch, so I thought it might help to rebase
to the current master.  I did that without complaint in my local
repository, but I can't push that back to github:

auge92> git push
To github.com:openvehicles/Open-Vehicle-Monitoring-System-3.git
 ! [rejected]          mongoose-wolfssl -> mongoose-wolfssl (non-fast-forward)
error: failed to push some refs to 'github.com:openvehicles/Open-Vehicle-Monitoring-System-3.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 have all the same changes on my local repo as on github, but I
observe that all the commits I made since branching (beginning with
04fafb83a3cc5563a5feb70a4bb7922457d58893) have a different commit id
than what is in my local mongoose-wolfssl repo for the same changes.
This is what causes the complaint above.

I must have done something wrong back at the beginning of working on
this branch.  Any idea what I might have done?

Would this be an appropriate scenario to use "git push --force" to
correct the problem?

                                                        -- Steve

More information about the OvmsDev mailing list