| 4 Jun 2024 |
 Arian | The backport failed to due a merge conflict and my git foo is not good enough. Help would be appreciated https://github.com/NixOS/nixpkgs/pull/317257#issuecomment-2148339873 | 20:13:59 |
| Arian | it's late here and my brain is fried :') | 20:14:14 |
 Sandro 🐧 | git checkout release-24.11 -b backport-xxxx
git cherry-pick hash
vim file/path
fix the issue
git add file/path
git cherry-pick --continue
git push
| 20:36:47 |
| Sandro 🐧 | * git checkout release-24.11 -b backport-xxxx
git cherry-pick hash
vim file/path
# fix the issue
git add file/path
git cherry-pick --continue
git push
| 20:36:58 |
| Sandro 🐧 | and yeah, that PR should be backported 🙂 | 20:37:37 |
 m1cr0man | In reply to @sandro:supersandro.de
git checkout release-24.11 -b backport-xxxx
git cherry-pick hash
vim file/path
# fix the issue
git add file/path
git cherry-pick --continue
git push
Huh, did not know you could check out a ref with -b at the same time. I always checkout then checkout again 😜 | 20:54:34 |
| Sandro 🐧 | In reply to @m1cr0man:m1cr0man.com
Huh, did not know you could check out a ref with -b at the same time. I always checkout then checkout again 😜 TYL | 22:01:39 |
| 5 Jun 2024 |
| Arian | all done! thanks all | 06:37:01 |
 Stéphan | Arian: Thanks for carrying the PR through. I'm in the middle of a move, so couldn't respond in time. 🙂 | 08:07:45 |
