{"id":40778,"date":"2023-10-11T17:21:29","date_gmt":"2023-10-11T21:21:29","guid":{"rendered":"https:\/\/mjtsai.com\/blog\/?p=40778"},"modified":"2023-12-29T12:03:53","modified_gmt":"2023-12-29T17:03:53","slug":"kaleidoscope-4-2","status":"publish","type":"post","link":"https:\/\/mjtsai.com\/blog\/2023\/10\/11\/kaleidoscope-4-2\/","title":{"rendered":"Kaleidoscope 4.2"},"content":{"rendered":"<p><a href=\"https:\/\/blog.kaleidoscope.app\/2023\/09\/22\/the-cure-for-merge-madness\/\">Christopher Atlan<\/a> (<a href=\"https:\/\/twitter.com\/kaleidoscopeapp\/status\/1707043848927519122\">tweet<\/a>):<\/p>\n<blockquote cite=\"https:\/\/blog.kaleidoscope.app\/2023\/09\/22\/the-cure-for-merge-madness\/\"><p>In the window title bar you&rsquo;ll see a new element that gives you more detail about the task. You&rsquo;ll see how many conflicts you still need to resolve in that file.<\/p><p>[&#8230;]<\/p><p>The window has a new area between the title bar and the Path Bar. We call it Context Shelf. [&#8230;] In the middle, depending on the conflict type (did you really expect Git to only have one?), you&rsquo;ll see a description of what you are dealing with (a merge in this case) and which refs are involved. We will also try show you branch names when available.<\/p><p>[&#8230;]<\/p><p>Finally, the Path Bar above the text views has been tweaked to outline exactly what content is shown where.<\/p><\/blockquote>\n<p>Another solid update.<\/p>\n\n<p>Previously:<\/p>\n<ul>\n<li><a href=\"https:\/\/mjtsai.com\/blog\/2023\/08\/08\/kaleidoscope-4-1\/\">Kaleidoscope 4.1<\/a><\/li>\n<\/ul>","protected":false},"excerpt":{"rendered":"<p>Christopher Atlan (tweet): In the window title bar you&rsquo;ll see a new element that gives you more detail about the task. You&rsquo;ll see how many conflicts you still need to resolve in that file.[&#8230;]The window has a new area between the title bar and the Path Bar. We call it Context Shelf. [&#8230;] In the [&hellip;]<\/p>\n","protected":false},"author":1,"featured_media":0,"comment_status":"open","ping_status":"closed","sticky":false,"template":"","format":"standard","meta":{"apple_news_api_created_at":"2023-10-11T21:21:31Z","apple_news_api_id":"0fb56ead-78f6-4ded-8aba-22841bf4a2c7","apple_news_api_modified_at":"2023-10-11T21:21:32Z","apple_news_api_revision":"AAAAAAAAAAD\/\/\/\/\/\/\/\/\/\/w==","apple_news_api_share_url":"https:\/\/apple.news\/AD7VurXj2Te2KuiKEG_Sixw","apple_news_coverimage":0,"apple_news_coverimage_caption":"","apple_news_is_hidden":false,"apple_news_is_paid":false,"apple_news_is_preview":false,"apple_news_is_sponsored":false,"apple_news_maturity_rating":"","apple_news_metadata":"\"\"","apple_news_pullquote":"","apple_news_pullquote_position":"","apple_news_slug":"","apple_news_sections":"\"\"","apple_news_suppress_video_url":false,"apple_news_use_image_component":false,"footnotes":""},"categories":[2],"tags":[75,377,2058,30,32,2385,71,376],"class_list":["post-40778","post","type-post","status-publish","format-standard","hentry","category-technology","tag-developertool","tag-git","tag-kaleidoscope","tag-mac","tag-macapp","tag-macos-14-sonoma","tag-programming","tag-versioncontrol"],"apple_news_notices":[],"_links":{"self":[{"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/posts\/40778","targetHints":{"allow":["GET"]}}],"collection":[{"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/posts"}],"about":[{"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/types\/post"}],"author":[{"embeddable":true,"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/users\/1"}],"replies":[{"embeddable":true,"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/comments?post=40778"}],"version-history":[{"count":1,"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/posts\/40778\/revisions"}],"predecessor-version":[{"id":40779,"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/posts\/40778\/revisions\/40779"}],"wp:attachment":[{"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/media?parent=40778"}],"wp:term":[{"taxonomy":"category","embeddable":true,"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/categories?post=40778"},{"taxonomy":"post_tag","embeddable":true,"href":"https:\/\/mjtsai.com\/blog\/wp-json\/wp\/v2\/tags?post=40778"}],"curies":[{"name":"wp","href":"https:\/\/api.w.org\/{rel}","templated":true}]}}