Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ghost rename, work in progress #291

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

ghost rename, work in progress #291

wants to merge 4 commits into from

Conversation

WardCunningham
Copy link
Member

@WardCunningham WardCunningham commented Aug 2, 2022

Work To Do

  • Be sure the text is clean. Especially avoid accidental copy-paste of html
  • Remove _rev0 from id and url (and more?) when renaming a journal create item
  • Address the issue of deleting renamed versions of pages. (Recalling 'create' resets the title.) ✔︎
  • Consistent for all page creation mechanisms. (Link clicked vs. Create New Page.) ✔︎
  • Page names in Assets folders.

Features So Far

image

@paul90
Copy link
Member

paul90 commented Feb 16, 2023

A number of changes got clobbered by that 'merged with master' commit.

@WardCunningham
Copy link
Member Author

Robert Best and I have reviewed this pull request and would like to do the work toward completion together as follows:

  • Be sure the text is clean. Especially avoid accidental copy-paste of html -- probably just some regex, revert if unacceptable
  • Remove _rev0 from id and url (and more?) when renaming a journal create item -- do the suggested removes, more test cases
  • Page names in Assets folders. -- we should not mess with assets, good example case is Eric duplicating a page with code to explore a new variation while using esm.html

I'm unsure about how that last commit did nothing useful and was so damaging. How can we remove it from this pull request? Please help.

@paul90
Copy link
Member

paul90 commented Mar 6, 2024

Well this PR was started back in 2022, so there have been changes.

Rather than trying to merge master into these changes, it would be better to rebase. So,

  1. do a hard reset to get rid of that merge.
  2. ensure you have all the changes from origin, the master branch you merged in was over a year old!
  3. with ward/title checked out git rebase master

There appears to be two areas of conflict. The only one that needs any attention is in lib/addToJournal.coffee. For package-lock.json pick the one in master.

Once all is resolved, you will need to force push the update back to github.

@WardCunningham
Copy link
Member Author

Paul and I fixed up this pull request which was against an old version and merged incorrectly. It's in good shape now and ready for finish work called out above.

@WardCunningham
Copy link
Member Author

Thanks to Paul for help on this last change.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants