search

gaak99 / oxly

oxly auto-merges Dropbox file revisions with a git-like cli
MIT License
9 stars 1 forks source link

clunky filepath post merge save buf #9

Closed gaak99 closed 7 years ago

gaak99 commented 7 years ago

The merge paths are under .oxit and confusing as fuxx (exposing non useful internals to boot) so need to be cleaned up.

gaak99 commented 7 years ago

Via merge --dry-run you can see the clunky paths

$ oxit merge --dry-run orgzly/oxit-merge-me-maybe.org merge dry-run: emacsclient --eval '(ediff-merge-files "/tmp/myoxitrepo/.oxit/orgzly/.oxit::oxit-merge-me-maybe.org/2c120446decd"

The main problem is the post ediff save merged buf is in the wrong dir so the user has to remember to rewhack the path to the correct dir.

gaak99 commented 7 years ago

ok here's how it looks now

merge dry-run: emacsclient --eval '(ediff-merge-files "/tmp/myoxitrepo/orgzly/oxit-merge-me-maybe.org::2c120446decd" "/tmp/myoxitrepo/orgzly/oxit-merge-me-maybe.org::2c130446decd")'