#robotics Logs

Jul 25 2020

02:55 AM katsumi_ is now known as broken_law
04:16 AM mrdata: rue_bed2, i believe it is possible but i am not a git expert; you would check out the old thread and then merge it forward but i dont know if you have to fork it, or if you have to merge with each commit on the sequence from old to new
04:17 AM mrdata: when i have done stuff like this manually, i have sometimes encountered fuzz in intermediate versions than prevents a merge
04:17 AM mrdata: those conflicts have to be resolved
04:19 AM mrdata: rue_shop2, ^
04:20 AM mrdata: i first encountered this kind of problem in the old days of usenet, when conext diffs and patch were used
04:20 AM mrdata: and then through RCS and CVS
04:21 AM mrdata: but i never learned git very well
04:24 AM mrdata: s/conext/context
04:25 AM mrdata: so the sequence might be, to fork then to merge each commit on the main branch into your stuff, resolve conflicts, write tests, and iterate until your branch is most-similar to the main branch
04:27 AM mrdata: then finally push your branch back onto main
04:31 AM rue_mohr: hmm
05:58 AM Elleo: 11
05:58 AM Elleo: oops
11:16 PM rue_shop1: 22