dexie / dexie-website

Website dexie.org
https://dexie.org
Apache License 2.0
33 stars 292 forks source link

Various small changes #111

Closed garcialo closed 1 year ago

garcialo commented 1 year ago
garcialo commented 1 year ago

...I'm not sure why it has all the previous commits as well. Is that normal?

dfahlander commented 1 year ago

...I'm not sure why it has all the previous commits as well. Is that normal?

If you merge from upstream and push again, I think they will disappear.

git merge upstream/master
git push
garcialo commented 1 year ago

I've tried doing that and I keep getting feedback that everything is up-to-date. Well I get errors with master/main, but not with the default branch. To be more clear...

git merge upstream/master
merge: upstream/master - not something we can merge

git merge upstream/main
merge: upstream/main - not something we can merge

git merge upstream/gh-pages
Already up to date.

git push
Everything up-to-date

I primarily use github.com/GitHub Desktop, I made sure that my fork was synced, and fetched locally to make sure everything was in the same state before this PR. The page for my fork still shows...

This branch is not behind the upstream dfahlander:gh-pages
No new commits to fetch. Enjoy your day!

I'll look into this more a little later today and see what I can find.

dfahlander commented 1 year ago

Ah, your right, the main branch in this repo is "gh-pages". No problem that the old commits are there - the total changes only show the last ones. To get rid of the changes in future commits I think you can rebase your fork from the upstream:

git rebase upstream/gh-pages
git push --force
dfahlander commented 1 year ago

Regarding the changes - they're really great!