search

emacscollective / no-littering

Help keeping ~/.config/emacs clean
GNU General Public License v3.0
635 stars 69 forks source link

elpher: theme elpher-bookmarks-file #128

Closed condy0919 closed 4 years ago

condy0919 commented 4 years ago
tarsius commented 4 years ago

Thanks!

This file is used to store an s-expression.

The convention (A.5) in that case is to add the ".el" suffix.

condy0919 commented 4 years ago

Fixed

tarsius commented 4 years ago

Please rebase your branch on top of the latest origin/master and then force push.

I would have done this myself, but then this pull-request would forever remain "closed" instead of "merged", because I don't have permissions to push to your master branch.

tarsius commented 4 years ago

Unfortunately this pull-request asks for your master branch to be merged into ours. It is better to use a dedicated feature branch instead, as explained here. It is too late for this pull-request now, but the next time you open a pull-request (in any repository really), then please use a feature branch.

This is a canned response; it may not apply 100% in this case.

condy0919 commented 4 years ago

Should I close and reopen another pull request using dedicated branch?

tarsius commented 4 years ago

No. Just rebasing is enough:

git fetch origin
git rebase origin/master
git push --force-with-lease condy0919 HEAD

(Of course adjust the names of the remotes as needed.)

condy0919 commented 4 years ago

Correct me if I'm wrong.

git remote add upstream https://github.com/emacscollective/no-littering

then

git fetch upstream
git rebase upstream/master
git push --force-with-lease origin HEAD

where origin is git@github.com:condy0919/no-littering.git.

But GitHub tells me Everything up-to-date.

tarsius commented 4 years ago

Yes, it actually already was rebased before. I guess I looked at it wrong. :grinning: