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
Leave a Reply.AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |