Closed mdroidian closed 2 years ago
Take 2 of https://github.com/ToolsForThoughtRocks/ToolsForThoughtLogSeq/pull/2 😆
@bmann I didn't git rebase. I just did a git pull and used VSCode to conflict merge. Seemed like it was just from the config pages changes from the new commits since the PR. 🤷♂️
git rebase
git pull
Let me know if that's an issue and I can try again! 👍
Take 2 of https://github.com/ToolsForThoughtRocks/ToolsForThoughtLogSeq/pull/2 😆
@bmann I didn't
git rebase
. I just did agit pull
and used VSCode to conflict merge. Seemed like it was just from the config pages changes from the new commits since the PR. 🤷♂️Let me know if that's an issue and I can try again! 👍