search

miraisolutions / compareWith

RStudio Addins for Enhanced Diff and Merge
55 stars 11 forks source link

Git comparison functionality #48

Closed riccardoporreca closed 2 years ago

riccardoporreca commented 2 years ago

See #46 for details, integrating the functionality proposed by @statnmap in #37.

Also includes a small fix for #47.

We should consider adding a NEWS.md to the project.

To be tested upon review, also on MacOS and Windows. Note that there isn't much handling for cases where git difftool fails (even badly, like if there is no Git repo), we can tackle this with a dedicated later refinement.

RolandASc commented 2 years ago

@riccardoporreca I finally got around to reviewing this. Happy with the code, logic and documentation.

Regarding your initial comment

To be tested upon review, also on MacOS and Windows.

I haven't done much here yet, but can volunteer to test on Windows.

I'd agree with adding a NEWS.md, would probably put that as an initial file in another separate mini-PR and merge that first, then update the file in this PR with the relevant news. Let me know.

riccardoporreca commented 2 years ago

I'd agree with adding a NEWS.md, would probably put that as an initial file in another separate mini-PR and merge that first, then update the file in this PR with the relevant news. Let me know.

Good idea, I can create a PR for that, with a NEWS.md for the current initial version of compareWith, which we can then create a release for. We'll then merge this with updated news and a new version.