What tool for Mac to compare and merge files for theme updates?

[alwayspaws]

What Free and intuitive tool can I use for the Mac to compare and merge files for theme updates?

I’m hoping to update my transformer theme to latest version 3 for PS 1.6.

This link discusses some but I don’t have any experience with finding and merging file changes. I only need it for a one time use. Not ongoing.

https://www.git-tower.com/blog/diff-tools-mac

[Beeta]

As a text editor I use: Text Wrangler

I use it for compare files/directories too.

[alwayspaws]

@FooLab

Have you ever used it to check code differences between different versions of themes? There are hundreds of files that have been changed.

I just checked out that link and “TextWrangler is not compatible with macOS 10.13 (High Sierra).”

It’s suggests BBedit which doesn’t look very promising either.

Jonny said he uses svn but since it’s apache, it looks a little complicated. Thoughts?

Thanks

[lesley]

Is there a reason you are wanting to update your theme? I always take the if its not broken don't fix it stance.

[Beeta]

I'm on high sierra and TW 5.5.2 works. I installed BBEdit and is the same as TW, I'm going to BBedit (free) now as TW seems to not getting updated anymore.

Hundred of files changes... but do you merge them automatically? Don't you manually review them before merging?

All depends on how often you are going to do this updates... you could setup a private GitHub (has a price) or install the alternative GitLab (never used) and

[alwayspaws]

@lesley Yes, because I’m using old version: Transformer Version 3.2.9 for PS 1.6 / THIRTY BEES and the theme is up to version 3.3.5.

I constantly have to ask Jonny for custom CSS codes and other changes. There was another bug just now that they fixed the file for me for.

[lesley]

Ahh ok.

[alwayspaws]

@FooLab I’ve never done this before. I don’t know what my plan of action is going to be.

Can you please tell me how intuitive and easy it is to use BBedit?

Thanks ??

[alwayspaws]

@FooLab I keep folders of updated and changed files and templates on my hard drive so that I have a general idea of all the changes I’ve made. But it’s still a lot of them.

Also, if I have to deal with PHP I’m up the creek because I don’t know how to do that at all. Whatever I use has to be free for now.

And by the way I did not have transformer for three years. I just happened to download an old version when I bought it but I didn’t know that.

[alwayspaws]

No one has any experience with the tools reviewed here?

https://www.git-tower.com/blog/diff-tools-mac

[Beeta]

BBEdit compare and merge works like this (4'04''): https://youtu.be/-gca80hbnIU?t=4m3s

The other solutions I don't know if they allow you to edit files during the merge.

[bzndk]

Aint it a security hassard to run 3 years old code ? :|

[alwayspaws]

@bzndk Edited my post. old version: Transformer Version 3.2.9 for PS 1.6 / THIRTY BEES

the theme is up to version 3.3.5.

[alwayspaws]

@foolab Thanks for this vid. It really helps. I’ll get BBEdit for Mac here:

https://www.barebones.com/products/bbedit/download.html

[Beeta]

@alwayspaws :ok_hand: I think that the free version will be enough.

[alwayspaws]

@FooLab I'm studying the manual.