Post A5MpZXh1CheTKjSMWu by Seferi@fosstodon.org
 (DIR) More posts by Seferi@fosstodon.org
 (DIR) Post #A5Mjr67lqHIRJoxQC8 by kev@fosstodon.org
       2021-03-19T11:01:56Z
       
       1 likes, 8 repeats
       
       Just sayin' #Git
       
 (DIR) Post #A5MkSwA1Kr33QA3LPM by edgren@fosstodon.org
       2021-03-19T11:08:51Z
       
       0 likes, 0 repeats
       
       @kev What game? I would love to play around with it like that 😂
       
 (DIR) Post #A5MkUfNAiu95vw1rGK by yyp@fosstodon.org
       2021-03-19T11:09:01Z
       
       0 likes, 0 repeats
       
       @kev That's literally my conflicts view when I rebase/merge the wrong branch
       
 (DIR) Post #A5Mnjfl9ro2DL75yoC by kev@fosstodon.org
       2021-03-19T11:45:26Z
       
       0 likes, 0 repeats
       
       @edgren no idea, but it does look really cool, doesn't it! 🙂
       
 (DIR) Post #A5MnpJreBbBnAap6W0 by kev@fosstodon.org
       2021-03-19T11:46:28Z
       
       0 likes, 0 repeats
       
       I know I'm incredibly sad, but I keep watching this over and over and it STILL makes me actually laugh out loud.
       
 (DIR) Post #A5MoEYNzKeMPRnz13w by reaper@fosstodon.org
       2021-03-19T11:50:54Z
       
       0 likes, 0 repeats
       
       @kev happens happens, I'd normally just rebase everything and deal with it one by one , easier than dealing with 1000's of conflicts at oncehope you feel better through
       
 (DIR) Post #A5MpZXh1CheTKjSMWu by Seferi@fosstodon.org
       2021-03-19T12:05:55Z
       
       0 likes, 0 repeats
       
       @kev Same here mate! Can't stop watching it...
       
 (DIR) Post #A5Muvn9ysTNtRgQr20 by braunne@fosstodon.org
       2021-03-19T13:06:00Z
       
       0 likes, 0 repeats
       
       @kev Funny! Well, use #mercurial instead
       
 (DIR) Post #A5MzdZiWcPmIJNisOe by derp@fosstodon.org
       2021-03-19T13:58:34Z
       
       0 likes, 0 repeats
       
       @kev clearly a merge conflict 😂
       
 (DIR) Post #A5N65YcGu8uKjMWY76 by dwagenk@chaos.social
       2021-03-19T15:11:01Z
       
       0 likes, 0 repeats
       
       @kev how would rebasing look?
       
 (DIR) Post #A5NOQUtvi8xOSquz6O by gruffymax@fosstodon.org
       2021-03-19T18:36:10Z
       
       0 likes, 0 repeats
       
       @kevMy wife is looking at me thinking "WTF is he laughing at?"I explained the best I could.She's still looking at me thinking "WTF is he still laughing at"! #lol
       
 (DIR) Post #A5NquMCtOi0Yu6oYD2 by orcun@oyd.social
       2021-03-19T23:55:34Z
       
       0 likes, 0 repeats
       
       @kev classic
       
 (DIR) Post #A5NxWdnF3mIwAySFuK by WClayFerguson@fosstodon.org
       2021-03-20T01:09:53Z
       
       0 likes, 0 repeats
       
       @kev Ya gotta do the most frequent and therefore the smallest merges possible, imo.  Use a feature flag boolean to turn off your new code feature, until it's done (whenever that's possible), and then your final "merge" is basically to turn the feature on.
       
 (DIR) Post #A5UF4WZuIVe5ba0cEa by roland@f.haeder.net
       2021-03-23T01:52:01Z
       
       0 likes, 0 repeats
       
       @kev Is there also a #rebase video?
       
 (DIR) Post #A5UFKmtxNKcSrf8rQm by friend@linuxrocks.online
       2021-03-23T01:57:46Z
       
       0 likes, 0 repeats
       
       @kev That's why you 𝚐𝚒𝚝  𝚙𝚞𝚜𝚑  ––𝚏𝚘𝚛𝚌𝚎: