2c:["$","title",null,{"children":"Fork, suggest, merge | Observable | Observable"}] 31:[{"id":"eb719f0fe34782b1a121c3369896774cd3816947705215b70d758db3f5e5fa9c701649e600c9c3bb350dc8efa13ea9024ec5b0d629d6e847038aa4e76fc856e9","href":"https://static.observableusercontent.com/files/eb719f0fe34782b1a121c3369896774cd3816947705215b70d758db3f5e5fa9c701649e600c9c3bb350dc8efa13ea9024ec5b0d629d6e847038aa4e76fc856e9","name":"republish.png","type":"image/png","lastModified":1572461903139.276,"size":816195},{"id":"ae51835671e6da791403897bd6085f2d83f0bd271e7d202730b2a0a97725b533dbe679ade0c179e16f5edec128a315e0310acf6408745652f1772f2874299288","href":"https://static.observableusercontent.com/files/ae51835671e6da791403897bd6085f2d83f0bd271e7d202730b2a0a97725b533dbe679ade0c179e16f5edec128a315e0310acf6408745652f1772f2874299288","name":"visible.png","type":"image/png","lastModified":1572461879978.91,"size":831952},{"id":"179bfcfcfd45502460f343adfe27db5a1ee253fd9e562b6a8ac1d867e9069c6f3b276f8f1b89272bb1244540ae3c0726ecdc0ab847e21add92b14e91661ca0d4","href":"https://static.observableusercontent.com/files/179bfcfcfd45502460f343adfe27db5a1ee253fd9e562b6a8ac1d867e9069c6f3b276f8f1b89272bb1244540ae3c0726ecdc0ab847e21add92b14e91661ca0d4","name":"removed-added.png","type":"image/png","lastModified":1572461846720.685,"size":1106678},{"id":"8f19f65c7b27b0b85744efe84eeb97cd24d117d5c31f343496695eb191003cf827368df12426c3109c4cee7b297797fd9c4761d8240fc6b7bc857688f548f59c","href":"https://static.observableusercontent.com/files/8f19f65c7b27b0b85744efe84eeb97cd24d117d5c31f343496695eb191003cf827368df12426c3109c4cee7b297797fd9c4761d8240fc6b7bc857688f548f59c","name":"projection.png","type":"image/png","lastModified":1572461769589.515,"size":1136721},{"id":"a7d631028e0438a66d1e452c931029816c52915fee69f9ced3e553fe0c3c3b883dc593e564be61967acd18399386e9bc2e1b352cd00626b68ebb3659c02bfeda","href":"https://static.observableusercontent.com/files/a7d631028e0438a66d1e452c931029816c52915fee69f9ced3e553fe0c3c3b883dc593e564be61967acd18399386e9bc2e1b352cd00626b68ebb3659c02bfeda","name":"share-fork.png","type":"image/png","lastModified":1572461794947.08,"size":1330541},{"id":"2db2de439baf5da2e251278145d9c606f510db69ff459ea8b268fcc74ccc20b9d67d89d4dec94f55fcc3da4f7f4a6d199a4b12e9c83bff8aedf374092e1d7d98","href":"https://static.observableusercontent.com/files/2db2de439baf5da2e251278145d9c606f510db69ff459ea8b268fcc74ccc20b9d67d89d4dec94f55fcc3da4f7f4a6d199a4b12e9c83bff8aedf374092e1d7d98","name":"update-fork.png","type":"image/png","lastModified":1572461934200.989,"size":24904},{"id":"45d070b347dbacc54fa3ae76fcf9c69f981fa65cf52561f470d377d8710bbf27a88e5181159c75d4ab175db3667ec7ce22b395c7d6abc33d994f3c0bfbe07fc2","href":"https://static.observableusercontent.com/files/45d070b347dbacc54fa3ae76fcf9c69f981fa65cf52561f470d377d8710bbf27a88e5181159c75d4ab175db3667ec7ce22b395c7d6abc33d994f3c0bfbe07fc2","name":"create-fork.png","type":"image/png","lastModified":1572461822595.711,"size":871773},{"id":"5abf0d8c670f23e75104ea75717e7c1f7cba18d803b47651331e069054b01125ce3cc9438780fb3222b74d10c01214640d6c24c1ecf4cc6aca2483a913ef1de1","href":"https://static.observableusercontent.com/files/5abf0d8c670f23e75104ea75717e7c1f7cba18d803b47651331e069054b01125ce3cc9438780fb3222b74d10c01214640d6c24c1ecf4cc6aca2483a913ef1de1","name":"choropleth.png","type":"image/png","lastModified":1572461737463.346,"size":930042},{"id":"e8a3db965ab6d0b7b5b1c3ad5480d64740b332e989de25f8c684990ae23556d3b1ccb284f7cb95d803987c2181b77c4fb2f01b63e3f176ddcf446c1b06be59d4","href":"https://static.observableusercontent.com/files/e8a3db965ab6d0b7b5b1c3ad5480d64740b332e989de25f8c684990ae23556d3b1ccb284f7cb95d803987c2181b77c4fb2f01b63e3f176ddcf446c1b06be59d4","name":"choropleth_change_to_Inputs.range.png","type":"image/png","lastModified":1644858638276.079,"size":85472},{"id":"298d3a8b3fa641fa6a211884b0702361114548b58ab0fa3c134033c5302dd58f02f01c7eaf651b3f3dffaa0ddd219cfc03241be7beee060ff24bf6fa55702f3f","href":"https://static.observableusercontent.com/files/298d3a8b3fa641fa6a211884b0702361114548b58ab0fa3c134033c5302dd58f02f01c7eaf651b3f3dffaa0ddd219cfc03241be7beee060ff24bf6fa55702f3f","name":"choropleth_suggestion_email.png","type":"image/png","lastModified":1644859182258.23,"size":62676},{"id":"d4690a9febe30b26ced89b6d3fd7c372c91af5e7608f396d91254182a187abb21c989f674bc548cc9ed054b8f52f8f5f3d602df8c55da8e5351078173c7945b5","href":"https://static.observableusercontent.com/files/d4690a9febe30b26ced89b6d3fd7c372c91af5e7608f396d91254182a187abb21c989f674bc548cc9ed054b8f52f8f5f3d602df8c55da8e5351078173c7945b5","name":"choropleth_suggestion.png","type":"image/png","lastModified":1644859633952.598,"size":196968},{"id":"2c9c6673d4e5aa8b9e99350e22e633e457c17f00b5185ea740e978cba8f78a6257f3efbc686032d5c4bee67744bde4016683ea79f3eabe8a2aa463a0c3be20ce","href":"https://static.observableusercontent.com/files/2c9c6673d4e5aa8b9e99350e22e633e457c17f00b5185ea740e978cba8f78a6257f3efbc686032d5c4bee67744bde4016683ea79f3eabe8a2aa463a0c3be20ce","name":"merge_confirm.png","type":"image/png","lastModified":1644860955791.505,"size":45782},{"id":"c5556cd4b0da2a96b13e6f4cb6d2cbd772df08415984cabdd34533b9d9ed03a7116403d311aa768b3cfcb16bff0943b815fbb3540001e9fe3d1435375e5a5516","href":"https://static.observableusercontent.com/files/c5556cd4b0da2a96b13e6f4cb6d2cbd772df08415984cabdd34533b9d9ed03a7116403d311aa768b3cfcb16bff0943b815fbb3540001e9fe3d1435375e5a5516","name":"republish_with_choropleth.png","type":"image/png","lastModified":1644861533877.41,"size":412690},{"id":"b2cf5a8b266e4def4fc42a35f59abd75e81e5878a7e6c20b65da6f97fd1019e300ca7fd8846f5bca8afbbe79e853491a314b3d4b785140ede3195abbd6fa765b","href":"https://static.observableusercontent.com/files/b2cf5a8b266e4def4fc42a35f59abd75e81e5878a7e6c20b65da6f97fd1019e300ca7fd8846f5bca8afbbe79e853491a314b3d4b785140ede3195abbd6fa765b","name":"fork_notebook.png","type":"image/png","lastModified":1644949601414.604,"size":69597},{"id":"ff99fe0820e574696f0a4cb72a87d290af986097ef512fbe1e575d56f5e3ffca38407c781bb7892ae7d51c6517f9dd8ac744b0755e24d9e9f663018e837d7cf0","href":"https://static.observableusercontent.com/files/ff99fe0820e574696f0a4cb72a87d290af986097ef512fbe1e575d56f5e3ffca38407c781bb7892ae7d51c6517f9dd8ac744b0755e24d9e9f663018e837d7cf0","name":"jeremys_published_choropleth.png","type":"image/png","lastModified":1644618801383.044,"size":349632},{"id":"c990f4477a71ed9f9e5d1fa9c9f8bfefab20a4e496844f322400decfec5ccf8207bfb25e5e46610f26b906bd1e2d268b967ac1ebb7dd440cfbef6b12140e541d","href":"https://static.observableusercontent.com/files/c990f4477a71ed9f9e5d1fa9c9f8bfefab20a4e496844f322400decfec5ccf8207bfb25e5e46610f26b906bd1e2d268b967ac1ebb7dd440cfbef6b12140e541d","name":"suggest_menu.png","type":"image/png","lastModified":1644613905935.735,"size":37891},{"id":"f4d592b241087eeee8490d675219049c6238dcf9fdd8b5ab917409dca2706956bdfd704f7f0268ccb6d41cd3b0f074f6188517e0821bbb522c1dc6a51ca33efd","href":"https://static.observableusercontent.com/files/f4d592b241087eeee8490d675219049c6238dcf9fdd8b5ab917409dca2706956bdfd704f7f0268ccb6d41cd3b0f074f6188517e0821bbb522c1dc6a51ca33efd","name":"proIndForkingPublicNotebook.png","type":"image/png","lastModified":1665593903851.413,"size":25895}] 2f:{"id":"82dbb114c23ac26d","slug":"fork-suggest-merge","title":"Fork, suggest, merge","thumbnail":"6ac3d790b3b62a670880234cfda2457fc8adecadbe8af3819f8097ac20e60ea0","access_level":"unlisted","create_time":"$D2018-11-12T18:28:00.918Z","update_time":"$D2023-01-30T23:41:51.847Z","view_time":null,"first_public_time":"$D2018-11-13T21:44:40.866Z","fork":false,"stars":34,"starred":false,"owner":{"type":"team","id":"f35c755083683fe5","login":"observablehq","name":"Observable","avatar_url":"https://avatars-next.observableusercontent.com/424c6c1f7794371c9915a160519bdfb34cf34e50069fcd6def38a1a04d4e9702","tier":"enterprise_2024"},"version":668,"publish_version":null,"role":null,"authored":false,"authors":[],"members":[{"type":"group","id":"c4990be612f2da51","login":"8788045797a2fd14","name":"Product Education","avatar_url":null,"tier":"public","role":"editor"},{"type":"individual","id":"074c414ad1d825f5","login":"mbostock","name":"Mike Bostock","avatar_url":"https://avatars-next.observableusercontent.com/7dbba99ced40bd5ab8013c99b1a11da61231bce321ba1148a9d16ad0f121550a","tier":null,"role":"editor"},{"type":"team","id":"f35c755083683fe5","login":"observablehq","name":"Observable","avatar_url":"https://avatars-next.observableusercontent.com/424c6c1f7794371c9915a160519bdfb34cf34e50069fcd6def38a1a04d4e9702","tier":"enterprise_2024","role":"viewer"}],"comments":[],"custom_thumbnail":true,"trashed":false,"subscribed":null,"forks":106,"collection":{"id":"f32cb7b0d22ffb6a","slug":"editing-publishing-collaborating","title":"Sharing and Collaboration","owner":{"id":"f35c755083683fe5","login":"observablehq","name":"Observable"}},"type":"notebook","body":{"title":"Fork, suggest, merge","cells":[{"id":394,"value":"# Fork, suggest, merge","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":420,"value":"Observable offers asynchronous collaboration using the **Fork**, **Suggest**, and **Merge** buttons. \n- When you **Fork** a notebook, you create your own copy of a notebook, which you can then edit freely without affecting the original.\n- Clicking **Suggest** causes an email to be sent back to the original notebook's author, with a link to your fork, containing your changes.\n- The original notebook's author can then click the link in the email, view your changes, and **Merge** some or all of the changes into their original notebook.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":586,"value":"explainForks = notice(htl.html`\nCreating a *fork* of a notebook means to make your own copy, like suddenly making a fork in the road and going your own way. This is a fundamental concept in software development, but if this idea is new to you, think of it as making a copy of a recipe. Once you have a copy, you can make changes without affecting the original—the forked copy of the recipe is yours to save, modify, or discard as you choose.

\nIf you are uncertain about this, try it: fork an existing notebook, and compare it side-by-side with the original. You'll see that you can make changes in your fork and the original stays the same. (When you want to share your changes, use Suggest—read on in this notebook to learn more.)`)","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":666,"value":"You can fork public notebooks, or notebooks where edit access has been shared with you. If you have been invited to only view a notebook, you will not be able to fork the notebook. In that event, the **Fork** button will not appear and `Fork` will not be a choice in the notebook menu.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":574,"value":"Assuming you have permission to fork a notebook, go to the notebook menu (${icon('menu')}) and click **Fork**. \n- If there is only a single possible destination for the forked notebook, the fork happens immediately, as soon as you click **Fork**.\n- If, however, you have a choice of multiple workspaces (for example, if you belong to a Team of any kind), or if you have edit permission to a notebook, then there are multiple possible combinations, and you will be shown a dialog box that enables you to specify the workspace that should receive the fork.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":664,"value":"Here are some examples:\n- If you have only a Free Individual workspace, and fork a Public notebook, the fork is created immediately.\n- If you have only a Free Individual workspace, but are a viewer on a Team of any kind, you will not be able to fork any Team notebooks, even though you can view them.\n- If you have a Pro Individual workspace and are also a Team member, you have a choice of individual or team workspaces, and public or private (Only you) notebook visibility.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":663,"value":"In the following example, the user Lionel Hollins, who also belongs to the Portland TrailBlazers Pro Team, can fork into either his own workspace, or the team workspace. Because the original notebook is public, the fork can also be public, or can be forked into a private version.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":662,"value":"

\n \n

Example of a Pro Individual and Pro Team member forking a public notebook. The notebook can go into either of the user's available workspaces, and can be public or private.

\n","pinned":false,"hidden":false,"mode":"html","author":"$undefined","summary":"$undefined"},{"id":661,"value":"However, if the original notebook were Private but shared with Lionel Hollins, even with edit permission, forking is not available.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":660,"value":" so a dialog box appears asking you to configure the forked notebook:\n - On a Public notebook, still has a choice of Public or Private, so dialog box appears.\n - On a Private notebook, there is no option to fork (private notebooks remain private)\n- Free Team\n - Only Public notebooks visible\n - User can fork to his own workspace, or to the Team workspace\n - Visibility limited to Public\n - Role of team member does not appear to make a difference\n- Pro Team\n - Public and private notebooks visible\n - Public notebooks can be forked to any workspace available to the user\n - Private notebooks can only be forked to their existing workspace\n","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":659,"value":"General rules about forking:\n- You cannot fork a notebook into having more visibility than the original.\n- You cannot fork a private notebook into your own public notebook, even if you have permission to edit the original.\n- You can only fork into workspaces that you belong to.\n- Private notebooks, if they can be forked at all, can only be forked into the workspace they are in.\n- Your role matters:\n - A viewer can fork public notebooks (fork happens immediately).\n - A viewer cannot fork shared private notebooks (can see but not fork).\n - A viewer cannot fork team notebooks (can see but not fork).","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":629,"value":"Click **Fork** on the dialog box to create the fork. After confirming, you have your own forked notebook to modify or experiment with.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":428,"value":"Now, after making changes in the fork, you might want to **Suggest** those changes back to the original author. Here is an example of how that works. ","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":637,"value":"Let's say we have a published notebook (originally from Observable emeritus Jeremy Ashkenas) mapping life expectancy around the world.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":375,"value":"

${await FileAttachment(\"jeremys_published_choropleth.png\").image()}

Published notebook with choropleth of global life expectancy.

\n\nAlthough the map is good, our colleague Peaches notices that it is using a custom slider, as opposed to the [range input](https://observablehq.com/@observablehq/input-range) that now is available in Observable.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":17,"value":"md`### 1. Fork to make changes.\n\nPeaches wants to use the newer way of doing things, so she forks the original notebook and then edits the code to use Inputs.range.\n\n

\n \n

The original notebook is changed.

\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":409,"value":"### 2. Use **Suggest** to share your changes.\n\nPeaches likes her improvements. Rather than keep them to herself, she clicks **Suggest** in the notebook menu. This sends us an email containing a link to Peaches's fork.\n","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":265,"value":"html`\n

\n \n

The Suggest menu item appears under the notebook menu (${icon('menu')}).

\n\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":461,"value":"### 3. The original author clicks View Suggestion to view the suggestions in the fork.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":448,"value":"html`\n

\n \n

Click View Suggestion to see the forked notebook and the suggested changes.

\n\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":452,"value":"### 4. The original author reviews and Merges the suggested changes.\n\nAfter clicking **View Suggestion** we see the forked notebook, with the additions and deletions clearly marked.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":467,"value":"html`\n

\n \n

The suggested changes are marked: deletions in red; additions in green.

\n\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":5,"value":"We can toggle the **Parent** and **Fork** in each cell to evaluate the changes. We can even edit a cell to make further changes.\n\nThe changes look good, so we click **Merge 1 change** at the top, in the blue banner. A modal asks us to confirm.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":477,"value":"html`\n

\n \n\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":475,"value":"Peaches’s change is now applied to the original notebook! (If we had made any other changes, the blue banner would say **Merge *N* changes** and those changes would be merged as well.)","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":609,"value":"noteSuggestions = notice(htl.html`\nTo read even more detail about accepting or discarding individual changes, see Suggestions.`)","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":490,"value":"### 4. Republish. 🎉\n\nWe're not quite done: Peaches’s change was applied, but is only visible to us. By clicking **Republish**, the change becomes visible to everyone.","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":494,"value":"html`\n

\n \n

Don't forget to click **Republish** to share the merged changes.

\n\n`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":399,"value":"We hope you’ll agree that this collaborative way of working can help you and your colleagues. The ability for anyone to suggest changes, and for authors to merge changes quickly and accurately, has been essential to the success of open source: if you remove the friction of collaboration, people will work together! ","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":52,"value":"The next time you find yourself reading a notebook and thinking, “I could offer a suggestion to that,” don’t keep that thought to yourself. **Fork, suggest, and merge!**","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":355,"value":"md`### 5. Epilogue: Updating a Fork.\n\nSometimes, while you’re working on a fork of a notebook, the parent notebook will have been updated with new changes. To view, select and merge in recent changes from the parent into the fork, click on “Compare reverse” in the notebook menu.\n\n\n

${Object.assign(await FileAttachment(\"update-fork.png\").image(), { style: 'max-width: 350px' })}

Compare reverse.

`","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":502,"value":"Thanks to [Jeremy Ashkenas](https://observablehq.com/@jashkenas) for his [original notebook](/@jashkenas/world-life-expectancy-1960-2016).","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":644,"value":"---","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":646,"value":"## Appendix","pinned":false,"hidden":false,"mode":"md","author":"$undefined","summary":"$undefined"},{"id":414,"value":"function icon(name) {\n switch (name) {\n case 'cell menu':\n return svg``;\n case 'menu':\n return svg``;\n }\n}","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"},{"id":562,"value":"notice = ((contents) => htl.html`\n

\n ${contents}\n

\n`)","pinned":false,"hidden":false,"mode":"ojs","author":"$undefined","summary":"$undefined"}],"files":"$W31","stdlib":"1","titling":"auto"}} 30:"$2f:body" 2b:E{"digest":"NEXT_REDIRECT;replace;/@observablehq/fork-suggest-merge;307;"}