This message was deleted.
# announcementss
Slackbot
04/27/2023, 7:41 PMThis message was deleted.
j
Jacob Gold
04/27/2023, 8:12 PMgit rebase should automatically skip rewriting commit 2 in this case, so I believe you'd be fine!
e
Elton Yang
04/27/2023, 8:13 PMgreat. every time I’ve used github where there’s a commit that’s been cherrypicked over, it’s shown the duplicate in the diff
j
Jacob Gold
04/27/2023, 8:14 PMyeah, that will show up until you restack on main, which is where that rebase will happen
Jacob Gold
04/27/2023, 8:15 PMvery similar to the case you may have seen where when you merge part of a stack and dont restack the remaining upstack prs, they include the changes from the merged prs until you restack