That’s how a three-way merge works - it’ll compare your changes with those made by your co-author. The changes aren’t fundamentally incompatible - we can quite happily end up with a story about a pilot that’s set in Chicago we just need a bit of help reconciling the changes.
Now you have three different versions of your story - the original base draft that you both started with, your version, with all the landmarks and street names changed from London to Chicago, and their version, where our protagonist is a helicopter pilot instead of a professor. You get a first draft that you’re both happy with… then a few days later, you email your friend saying “hey, I’ve had a brilliant idea - I’ve moved the story from London to Chicago” - and they email you back going “Oh, crap… I also had a brilliant idea… the lead character isn’t a professor any more, she’s a helicopter pilot!” For readers who haven’t encountered the joys of the three-way merge, it works kinda like this… imagine you and a friend are writing a book together - a thrilling airport blockbuster. Open them up in Beyond Compare and it’ll show you exactly what’s changed between them:īeyond Compare has comparison tools and viewers for many different file formats, so you can compare images visually to highlight any differences between them - and it’ll automatically scale images so your sources don’t even need to be the same size: You’ve got two text files, you want to know if they’re different – and if so, how.
It’s a file comparison tool called Beyond Compare, it’s available on macOS, Linux and Windows, and it absolutely rocks.
Today’s #nerdvent entry is another one of my must-have tools, a tool that’s saved me so much time over the years that it’s probably paid for itself many, many times over. Dylan's Advent of Cool Nerd Things Day 22: Beyond Compare Posted by Dylan Beattie on
0 kommentar(er)
