{"title":"squash merge\u306e\u74b0\u5883\u3067Cascading PRs\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642","height":"190","provider_name":"Hatena Blog","author_name":"oinume","blog_title":"oinume journal","blog_url":"https://journal.lampetty.net/","image_url":"https://m.media-amazon.com/images/I/516gEDDGmoL._SL500_.jpg","categories":["Git"],"version":"1.0","published":"2023-12-04 09:00:00","description":"\u6700\u8fd1\u4ee5\u4e0b\u306e\u3088\u3046\u306a\u8a18\u4e8b\u3092\u76ee\u306b\u3059\u308b\u3053\u3068\u304c\u3042\u308a\u3001\u3061\u3087\u3046\u3069\u81ea\u5206\u3082squash merge\u306e\u74b0\u5883\u3067\u3072\u3068\u3064\u554f\u984c\u3092\u62b1\u3048\u3066\u3044\u305f\u306e\u3067\u3001\u305d\u306e\u8a71\u3092\u81ea\u5206\u306e\u30e1\u30e2\u4ee3\u308f\u308a\u306b\u66f8\u304d\u305f\u304f\u306a\u3063\u305f\u3002 Git \u306e Squash \u30de\u30fc\u30b8\u3092\u3084\u3081\u305f\u8a71 - Mobile Factory Tech Blog squash and merge\u3057\u304b\u4f7f\u3063\u3066\u306a\u3044\u3051\u3069\u5168\u304f\u56f0\u3063\u3066\u306a\u3044 \u2013 Jun Mukai's blog \u554f\u984c\u3068\u306f\u3001\u4e0a\u306b\u3042\u308b\u8a18\u4e8b\u306ecascading PRs\u306e\u8a71\u3067\u3001feature1 -> feature2 \u3068\u3044\u3046\u3088\u3046\u306bbranch\u3092\u6d3e\u751f\u3057\u3066\u4f5c\u3063\u305f\u5834\u5408\u306b\u3001feature1 \u3092main\u306b\u30de\u30fc\u30b8\u3057\u305f\u5f8c\u306b\u4f5c\u696d\u30d6\u30e9\u30f3\u30c1\u3092 feature2 \u306b\u3057\u3066 gi\u2026","html":"<iframe src=\"https://hatenablog-parts.com/embed?url=https%3A%2F%2Fjournal.lampetty.net%2Fentry%2Fresolve-squash-merge-conflict\" title=\"squash merge\u306e\u74b0\u5883\u3067Cascading PRs\u3067\u30b3\u30f3\u30d5\u30ea\u30af\u30c8\u3057\u305f\u6642 - oinume journal\" class=\"embed-card embed-blogcard\" scrolling=\"no\" frameborder=\"0\" style=\"display: block; width: 100%; height: 190px; max-width: 500px; margin: 10px 0px;\"></iframe>","provider_url":"https://hatena.blog","author_url":"https://blog.hatena.ne.jp/oinume/","type":"rich","url":"https://journal.lampetty.net/entry/resolve-squash-merge-conflict","width":"100%"}