News for hackers. Stuff that matters.
Re:I need to copy 2000+ DVDs in 3 days. What are my options? by tracker1 on Tuesday December 18, 2018 @01:53PM (#18709377)
I've, frankly, done that many times at this point... when your merge request gets too wonky, it's just easier. I do try to remember to squash, then rebase generally, though there are times I just forget or mess up.
Re:I need to copy 2000+ DVDs in 3 days. What are my options? by rconti on Tuesday December 18, 2018 @02:26PM (#18709695)
When in doubt, "how does the team here handle these conflicts? At my old job we just did <made up thing> to solve it, I've forgotten the process here."