Author Topic: Which simple file-difference software  (Read 4893 times)

0 Members and 2 Guests are viewing this topic.

Offline Wilson__Topic starter

  • Frequent Contributor
  • **
  • Posts: 285
  • Country: gb
Which simple file-difference software
« on: June 22, 2024, 05:04:44 pm »
How you may recommend a simple software to compare edited source file with original so that we can sure to document the changes.

Many thanks
 

Offline RAPo

  • Super Contributor
  • ***
  • Posts: 1013
  • Country: nl
Re: Which simple file-difference software
« Reply #1 on: June 22, 2024, 05:15:21 pm »
Meld]Meld is a good one, If you have git, use git-diff
and for binary files use ImHex
« Last Edit: June 22, 2024, 06:10:55 pm by RAPo »
 
The following users thanked this post: Wilson__

Offline ataradov

  • Super Contributor
  • ***
  • Posts: 12504
  • Country: us
    • Personal site
Re: Which simple file-difference software
« Reply #2 on: June 22, 2024, 05:55:57 pm »
On Windows - WinMerge, on Linux - Meld.
Alex
 
The following users thanked this post: DimitriP, Wilson__

Offline BennoG

  • Frequent Contributor
  • **
  • Posts: 388
  • Country: nl
Re: Which simple file-difference software
« Reply #3 on: June 22, 2024, 06:21:13 pm »
beyond compare
for me that is the only one.

Benno
 
The following users thanked this post: Wilson__

Offline xvr

  • Frequent Contributor
  • **
  • Posts: 940
  • Country: ie
    • LinkedIn
Re: Which simple file-difference software
« Reply #4 on: June 22, 2024, 09:23:49 pm »
I have a experience with both Meld and BeyondCompare. On big file BC works well, Meld silently died :(

PS. Good old diff works very well on files of any size, but using it after BC or Meld will be a little painful :(
« Last Edit: June 22, 2024, 09:25:49 pm by xvr »
 
The following users thanked this post: Wilson__

Offline 5U4GB

  • Super Contributor
  • ***
  • Posts: 1795
  • Country: au
Re: Which simple file-difference software
« Reply #5 on: June 23, 2024, 10:26:58 am »
On Windows - WinMerge, on Linux - Meld.

Another option for Windows is DiffMerge, for people who aren't fans of the angry fruit salad colour scheme used in WinMerge.
 
The following users thanked this post: Wilson__

Online zapta

  • Super Contributor
  • ***
  • Posts: 6610
  • Country: 00
Re: Which simple file-difference software
« Reply #6 on: June 23, 2024, 05:26:00 pm »
Another option is Araxis Merge.  I have been using it since 2008 on PC and MAC (my current license is from 2014) and it sill compares favorably with the alternatives.

https://www.araxis.com/merge/index.en
 
The following users thanked this post: Wilson__

Online zapta

  • Super Contributor
  • ***
  • Posts: 6610
  • Country: 00
Re: Which simple file-difference software
« Reply #7 on: June 23, 2024, 05:28:20 pm »
If you are diffing in Git, I recommend the free Visual Source Code. Open a folder within your local repository and it will diff it for you as will allow you to modify and submit.
 
The following users thanked this post: Wilson__

Online IanB

  • Super Contributor
  • ***
  • Posts: 13125
  • Country: us
Re: Which simple file-difference software
« Reply #8 on: June 23, 2024, 05:34:35 pm »
Another vote for Beyond Compare.
 
The following users thanked this post: Wilson__

Online IanB

  • Super Contributor
  • ***
  • Posts: 13125
  • Country: us
Re: Which simple file-difference software
« Reply #9 on: June 23, 2024, 05:37:09 pm »
How you may recommend a simple software to compare edited source file with original so that we can sure to document the changes.

If you are not already using a source control system like git, you really, really, really should be.

Among other things, changes then become self documenting because you can just look at the change history of a file.

Another point is that if you want to know the changes after the fact, then something has gone wrong. You need to plan the changes before the fact, execute them, and then test that they were successful.
 
The following users thanked this post: RAPo, Wilson__

Offline Wilson__Topic starter

  • Frequent Contributor
  • **
  • Posts: 285
  • Country: gb
Re: Which simple file-difference software
« Reply #10 on: June 24, 2024, 11:10:44 am »
Many thanks.  sounds like a good idea. 

1. Can we run a local git server on Windows 11 or need to use public GitHub?  It is for minimum number of developer and low traffic

2. will git server integrate with Stm32CubeIDE, PyCharm (community edition, free), PlatformIO (free), the traditional Arduino?

Many thanks
 

Offline xvr

  • Frequent Contributor
  • **
  • Posts: 940
  • Country: ie
    • LinkedIn
Re: Which simple file-difference software
« Reply #11 on: June 24, 2024, 11:39:17 am »
Quote
Can we run a local git server on Windows 11 or need to use public GitHub?  It is for minimum number of developer and low traffic
You can run basic configuration of GitLab (it's open source and free)
If you need to work in distributed team (over global) you could use GitHub of global GitLab.

Quote
will git server integrate with Stm32CubeIDE, PyCharm (community edition, free), PlatformIO (free), the traditional Arduino?
You can use standalone git with ANY IDE. Some of them have built in support (not sure for the list above)
 
The following users thanked this post: Wilson__

Offline RAPo

  • Super Contributor
  • ***
  • Posts: 1013
  • Country: nl
Re: Which simple file-difference software
« Reply #12 on: June 24, 2024, 12:47:16 pm »
pycharm has builtin gitlab/github functionality.
platform io has git-cli.
But why not use vs code install platformio, Arduino and STM32CubeMXPIO extensions and use the vs code GitHub/gitlab integration from one central place?
 
The following users thanked this post: Wilson__


Share me

Digg  Facebook  SlashDot  Delicious  Technorati  Twitter  Google  Yahoo
Smf

 

- - -
-->