[DiscordArchive] oh good to know.. should i redo the commits?
[DiscordArchive] oh good to know.. should i redo the commits?
Original source
`git cherry-pick --continue` after resolving conflicts is correct
rektbyfaith
07-26-2025, 09:31 AM #11Archived author: Tea • Posted: 2025-07-26T09:31:18.887000+00:00
Original source
`git cherry-pick --continue` after resolving conflicts is correct
Original source
ye I will do it that way then too
rektbyfaith
07-26-2025, 09:32 AM #12Archived author: Ergar • Posted: 2025-07-26T09:32:50.013000+00:00
Original source
ye I will do it that way then too
Original source
maybe gitextensions is not that reliable
rektbyfaith
07-26-2025, 09:33 AM #13Archived author: Ergar • Posted: 2025-07-26T09:33:27.233000+00:00
Original source
maybe gitextensions is not that reliable
Original source
its still the best gui tbh
rektbyfaith
07-26-2025, 09:33 AM #14Archived author: Tea • Posted: 2025-07-26T09:33:46.846000+00:00
Original source
its still the best gui tbh
Original source
I'm still not sure about when I cherry pick a commit and its changes are not for 3.3.5 and/or breaks the build, do I keep the commit and fix it in a following commit or do I make the changes in the cherry picked commit like I did in my worldstats PR? How do you handle that?
rektbyfaith
07-26-2025, 09:55 AM #15Archived author: Ergar • Posted: 2025-07-26T09:55:57.316000+00:00
Original source
I'm still not sure about when I cherry pick a commit and its changes are not for 3.3.5 and/or breaks the build, do I keep the commit and fix it in a following commit or do I make the changes in the cherry picked commit like I did in my worldstats PR? How do you handle that?
Original source
ideally you would adjust the cherry picked commit to fit. either by commenting out the code that's not needed or by removing it entirely. Same goes for builds. When the build breaks because of that commit and it's not fixed by a future cherry pick, it should be fixed in there as well
rektbyfaith
07-26-2025, 10:09 AM #16Archived author: Northstrider • Posted: 2025-07-26T10:09:10.292000+00:00
Original source
ideally you would adjust the cherry picked commit to fit. either by commenting out the code that's not needed or by removing it entirely. Same goes for builds. When the build breaks because of that commit and it's not fixed by a future cherry pick, it should be fixed in there as well
Original source
wish i had it on mac
rektbyfaith
07-26-2025, 11:44 AM #17Archived author: Warpten • Posted: 2025-07-26T11:44:38.176000+00:00
Original source
wish i had it on mac
Original source
realistically i could build my own branch that gets rid of vs/shell integration
rektbyfaith
07-26-2025, 11:48 AM #18Archived author: Warpten • Posted: 2025-07-26T11:48:19.930000+00:00
Original source
realistically i could build my own branch that gets rid of vs/shell integration
1 Guest(s)
1 Guest(s)