search

rnkn / fountain-mode

Emacs major mode for screenwriting in Fountain plain-text markup
https://fountain-mode.org
GNU General Public License v3.0
399 stars 15 forks source link

"In repository "fountain-mode", HEAD on default branch "master" has diverged from "origin/master"" #151

Closed tshiunghan closed 2 months ago

tshiunghan commented 2 months ago

I got the following message while updating packages on Doom Emacs. Which option should I choose?

In repository "fountain-mode", HEAD on default branch "master" has diverged from "origin/master"

1) Abort 2) Merge "origin/master" into "master" 3) Rebase "master" onto "origin/master" 4) Reset "master" to "origin/master" 5) Magit log "master...origin/master" and open recursive edit

How to proceed? (1, 2, 3, 4, 5)

Not sure if this is a Doom Emacs issue or not, but let me know if this isn't appropriate and I'll delete the issue.

rnkn commented 2 months ago

Sorry it's because I rewrote the history. Choose 4, Reset.

tshiunghan commented 2 months ago

Thanks for the quick response!