Which simple file-difference software - Page 1
Forum section: electronics / projects

author: Wilson__
author_rank: Frequent Contributor
timestamp: June 22, 2024, 05:04:44 pm
content: 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

author: RAPo
author_rank: Super Contributor
timestamp: June 22, 2024, 05:15:21 pm
content: Meld]Meldis a good one, If you have git, usegit-diffand for binary files useImHex

author: ataradov
author_rank: Super Contributor
timestamp: June 22, 2024, 05:55:57 pm
content: On Windows - WinMerge, on Linux - Meld.

author: BennoG
author_rank: Frequent Contributor
timestamp: June 22, 2024, 06:21:13 pm
content: beyond comparefor me that is the only one.Benno

author: xvr
author_rank: Frequent Contributor
timestamp: June 22, 2024, 09:23:49 pm
content: I have a experience with both Meld and BeyondCompare. On big file BC works well, Meld silently diedPS. Good olddiffworks very well on files of any size, but using it after BC or Meld will be a little painful

author: 5U4GB
author_rank: Super Contributor
timestamp: June 23, 2024, 10:26:58 am
content: Quote from: ataradov on June 22, 2024, 05:55:57 pmAnother option for Windows isDiffMerge, for people who aren't fans of the angry fruit salad colour scheme used in WinMerge.

author: zapta
author_rank: Super Contributor
timestamp: June 23, 2024, 05:26:00 pm
content: 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

author: zapta
author_rank: Super Contributor
timestamp: June 23, 2024, 05:28:20 pm
content: 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.

author: IanB
author_rank: Super Contributor
timestamp: June 23, 2024, 05:34:35 pm
content: Another vote for Beyond Compare.

author: IanB
author_rank: Super Contributor
timestamp: June 23, 2024, 05:37:09 pm
content: Quote from: Wilson__ on June 22, 2024, 05:04:44 pmIf 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.

author: Wilson__
author_rank: Frequent Contributor
timestamp: June 24, 2024, 11:10:44 am
content: 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 traffic2. will git server integrate with Stm32CubeIDE, PyCharm (community edition, free), PlatformIO (free), the traditional Arduino?Many thanks

author: xvr
author_rank: Frequent Contributor
timestamp: June 24, 2024, 11:39:17 am
content: QuoteYou 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.QuoteYou can use standalone git with ANY IDE. Some of them have built in support (not sure for the list above)

author: RAPo
author_rank: Super Contributor
timestamp: June 24, 2024, 12:47:16 pm
content: 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?