This message was deleted.
# how-do-is
Slackbot
11/10/2023, 5:43 AMThis message was deleted.
t
Tómas Þór Jónsson
11/10/2023, 5:44 AMBTW, I'm merging the PRs one by one through Github
n
Noé RUBINSTEIN
11/10/2023, 10:54 AMare you merging by merge, squash, or rebase?
Noé RUBINSTEIN
11/10/2023, 10:54 AMif you use squash or rebase this is normal
Noé RUBINSTEIN
11/10/2023, 10:55 AM(I would even say that for me, this problem is the raison d'être of Graphite)
t
Tómas Þór Jónsson
11/10/2023, 10:55 AMAhh, right. Yes we are squashing. Didn't think of that — I'm used to merge commits.
j
Jacob Gold
11/10/2023, 5:45 PMyes — squash or rebase will result in this state when consecutive branches change the same files, because git is no longer aware that that the merged version of the first branch doesnt conflict with the old version of the second one. if you
synct
Tómas Þór Jónsson
11/10/2023, 6:44 PMYeah, I tried that button. My gripe with it is that it doesn't copy the PR description as the commit description (this is an option when you merge on GitHub)
j
Jacob Gold
11/10/2023, 6:47 PMnoted – we can make that better!
❤️ 1
e
Egor N
11/10/2023, 7:30 PMthere's an option in the GitHub repo settings for the default squash commit, we chose " PR title and description"
Egor N
11/10/2023, 7:31 PMand from what I can tell, when using "merge N" it uses the GitHub's proposed commit message for squash
t
Tómas Þór Jónsson
11/10/2023, 7:35 PMHmm, I think I did have "Default to pull request title and description" chosen when I tried the "merge N" button but didn't see the descriptions being copied over 🤔