#linuxcnc-devel Logs

Apr 26 2018

03:04 AM Khetzal_ is now known as Khetzals
03:06 AM Khetzals is now known as Khetzal
03:38 PM cradek: what's the git merge strategy that lets you just understand one commit at a time? where it doesn't stack more and more stuff on top of the conflict-creator?
03:39 PM cradek: I remember there's something that iterates the merge-base somehow, but I can't come up with the name
03:46 PM seb_kuzm1nsky: imerge
03:46 PM seb_kuzm1nsky: it's an external plugin
03:47 PM cradek: thanks!
05:32 PM Tom_itx is now known as Tom_L