News for hackers. Stuff that matters.

A comment on Show HN: Sublime Merge – A Git client from the makers of Sublime Text. Parent comment

Re:Show HN: Sublime Merge – A Git client from the makers of ... by robin_reala on Thursday September 20, 2018 @11:12AM (#18033022)
I work a lot with repos with very long line lengths (regularly up to 10k characters) and have to often check and merge multiple changes per line. I really like Git clients that can do one or all of these things:

- Block a small threshold of vertical scrolling when scrolling horizontally on a trackpad to stop the current line I‘m tracking wavering up and down as I scroll.

- Highlight whether there are further changes on the same line in some way (e.g. Git Fork starts a highlight at the first change and stops it at the last).

- Allow some sort of merge comparison with word wrapping turned on (I‘m yet to find a client that does this).

If you can get the first, and one of the second or third in, then I‘ll happily pick up a Sublime Merge licence to go with my Sublime Text one. I do understand that this isn‘t a typical merge environment, but I’m editing ebooks with long paragraphs.

[ Parent | on HN ]
Re:Show HN: Sublime Merge – A Git client from the makers of ... by rdco on Friday September 21, 2018 @09:40AM (#18039592)
For your third point, maybe try out Kaleidoscope (macOS/iOS only):

https://www.kaleidoscopeapp.com/

You can map git difftool to it to launch it from the command line.

[ Parent | on HN ]
Re:Show HN: Sublime Merge – A Git client from the makers of ... by robin_reala on Sunday September 23, 2018 @02:39PM (#18052466)
Hey thanks, that actually looks really good! Will try it now.
[ Parent | on HN ]
Re:Show HN: Sublime Merge – A Git client from the makers of ... by ryanmonroe on Thursday September 20, 2018 @12:45PM (#18033792)
Sounds like it might be easier to just write a program which inserts line breaks after periods (and one to remove them), so you can edit the books in their typical format and export to "git format" to deal with versioning/branching/etc. Although it sounds like you've been doing this for a while so there's probably some reason this wouldn't work which I don't know.
[ Parent | on HN ]