Question: How can I merge changes from forks?

There are approximately a billion copies of Happening Folks. How can we integrate the changes into a shared version, assuming we want to? I don't even know which version I've linked to.

Summary: - Forking someone's fork back to yours is dangerous - Drag-dropping paragraphs from a "newer" page. - Experimental journal merge: drag-drop journals (I will experiment!)

Answers

Oh, I've discovered that drag-dropping from "newer" pages is a neat way of integrating into pages I started. It kind of destroys my fork of their fork, but I guess that's ok.

I note that forking someone's forked response to my question destroys any changes in the original that had happened since the fork point. This was initially upsetting as to (programmer) me "fork" implies change tracking and a subsequent information-preserving merge/rebase.

Mike Caulfield: Hover over the red-to-green square that gives you a hover tag of directory.fedwikihappening.net. I've consolidated people in there. Fork that one to your server.

Jon Udell: I had done so. Now I did again to refresh your changes. Was unclear until just now that reforking is an overwrite. See also Pull Request. Note also the transposition of your above two paragraphs in this fork of your fork of the original. Bug?

Jon Udell: I'm getting the strong feeling that Some Things Should Be Co-Edited. In recent days I forked Happening Folks from directory.fedwikihappening.net, added a bio for myself, and then later noticed (or think I noticed) that Mike had consolidated it into his page. Which is authoritative only to the extent that someone saw Mike's comment and expected it to be. Today I can find my bio nowhere. Was data lost? Not in the sense that the system failed to record an edit, I suspect, but rather in the sense that it has receded into one or more page histories. Which (see Finding Things in FedWiki) I suspect are not searchable.

Mike Caulfield: I should note there is a "journal merge" action that is experimental. This allows you to drop one journal onto another and combine the edit histories, which are then run to produce a guess at what a merge might look like. It works much of the time for simpler histories, but occasionally acts odd. It's not publicized because it can make messes.