タグ

ブックマーク / gist.github.com/mitchellh (1)

  • Merge vs. Rebase vs. Squash

    merge_vs_rebase_vs_squash.md I get asked pretty regularly what my opinion is on merge commits vs rebasing vs squashing. I've typed up this response so many times that I've decided to just put it in a gist so I can reference it whenever it comes up again. I use merge, squash, rebase all situationally. I believe they all have their merits but their usage depends on the context. I think anyone who sa

    Merge vs. Rebase vs. Squash
    mitaro
    mitaro 2023/12/03
    丁寧にやるというより、自分のために。コミットを細かく刻んでおくと、途中までよかったけどどん詰まりになったりした時のリカバリ楽だし、なによりあとで、なんでこうしたか迷子になりにくい。マージコミットも同様
  • 1