Araxis merge tutorial11/29/2023 ![]() ![]() With that said, I could kind of see how you were maybe trying to align the mixed layout and horizontal layouts by having the results on the bottom? ![]() One potential nit is the "inconsistency" of panel order between the horizontal and vertical layouts––I was expecting the results tab to be in the middle of the horizontal layout based on you demoing the vertical layout first. I love the mixed layout view, but more generally think that offering multiple layouts is the way to go. Why not have both? I personally question if I would have noticed either of the entry points that you demonstrated (or at least I think it would've taken me a while to notice), so having multiple opportunities to discover the new feature feels better to me than aligning on one of them. and another showing the same changes being picked on both branches: One with a selections from different conflicts on each branch: Here are two examples where selections have been made. The branch editors are read-only while the result editor is editable. Here it features a mixed layout with the branches on top and the resulting code below. Here's what the merge editor preview could look like. and another via the SCM where there could be an icon button (icon here is just a placeholder) on the file that has conflicts: One is via the existing codelens actions ("Preview Merge"). I've been exploring the idea of having multiple entry points from a merge conflict state. Here are some quick screenshots from the prototype above: Entry point Here's a brief walkthrough where I set up a simple merge conflict and resolve it with a three-way merge editor: three-way-merge-walkthrough-converted.2.mp4 Main views Here are some initial ideas to get the ball rolling □ Prototype We're exploring what it could look like to enable a three-way merge workflow in VS Code.
0 Comments
Cranberry curd tart atk11/29/2023 Cook until the cranberries have broken down, about ten minutes. To make the cranberry curd, combine cranberries, water and orange juice and zest in a medium saucepan over medium heat.If so, please let me know how it turned out! I hope that you find an occasion to make my cranberry curd tart this holiday season. You can also garnish the tart with pomegranate seeds, which look beautiful, or some strips of orange zest. If you need more detaield instructions, I followed this recipe. That’s a fun project as well! It’s quite simple: soak cranberries in a simple syrup for several hours and then roll them in sugar. I mentioned the sugared cranberries that I used to garnish the tart. Then, all that is left is to fill the tart and bake it for just a few minutes to set the curd. If you were serving the tart in the evening, you could roll out, chill and blind-bake the tart shell that morning. Likewise, you can make the cranberry curd as much as a day or two in advance and store it in the refrigerator. So, you can make and refrigerate the tart dough several days before you plan to serve the finished tart. However, the good news is that the steps can be broken down into different parts and prepared in advance. On the other hand, it’s no more work than making a tarte au citron, and we’ve seen the contestants on The Great British Baking Show make that in only a few hours, right? That guy!) So, as someone who has now made this tart multiple times, I can tell you that it is a bit of a project. (The real hero here is my husband who ate the first tart and then gamely ate the second tart as well. So, I made the tart again adjusting the recipe for the tart dough and increasing the quantity of cranberry curd. It wasn’t diasastrous but it wasn’t perfect either. And the amount of curd wasn’t quite enough to fill the shell. I underbaked the tart shell so it wasn’t as crispy as I wanted it to be. I have to confess, the first time I made this tart, I was not happy with the results. ![]() But looks-wise, none of them can compete with the stunning rosy-red color of this cranberry curd tart and when you garnish it with these sugared cranberries? Forget about it! The cranberry curd tart wins all the Thanksgiving dessert beauty contests. When it comes to Thanksgiving desserts, I love pumpkin, apple and even pecan pie as much as the next girl. ![]() It’s the same sweet-tart velvety cranbery curd that I made before, but now encased in a flaky, buttery tart shell. That’s why I came up with this elegant cranberry curd tart. But I think they deserve a spot on the dessert table as well. Of course, cranberries make an appearance at my Thanksgiving celebration in the form of homemade cranberry relish. AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |