search

AndrewCopeland / zettelkasten

Creating notes with the zettelkasten note taking method and storing all notes on github
Apache License 2.0
89 stars 11 forks source link

zk link fails to stage, commit changes #32

Closed yacc closed 3 years ago

yacc commented 3 years ago

I'm on mac OS Catalina, git version 2.26.2, and using the Git push option.

~/Development/zk on  main on 🐳 v20.10.0
➜ zk link my-first-zettel my-second-zettel
error: cannot pull with rebase: You have unstaged changes.
error: please commit or stash them.

~/Development/zk on  main [!] on 🐳 v20.10.0
➜ gst
On branch main
Your branch is up to date with 'origin/main'.

Changes not staged for commit:
  (use "git add <file>..." to update what will be committed)
  (use "git restore <file>..." to discard changes in working directory)
    modified:   1608732866-my-first-zettel.md
    modified:   1608733272-my-second-zettel.md

no changes added to commit (use "git add" and/or "git commit -a")
AndrewCopeland commented 3 years ago

Any recommendations on how to fix this? What is your expected behavior?

AndrewCopeland commented 3 years ago

Have you tried to use the zk push command. It looks like the 2 zettels were added but were not synced to github.

AndrewCopeland commented 3 years ago

Closing issue because of inactivity