Github Collaboration

[swguy]

That said, zcwilt and I will be chatting about re-normalizing all files. If we do it, be prepared for a massive number of changed files ... which upgraders will hate

Using the Linux tool diff with the option -w will only show non-whitespace differences. Using this utility, you can build the changed file list and only show files that have changed by more than whitespace.

[torvista]

Beyond Compare
Session->Session Settings->Compare Tab->Compare Contents (section), rules based radio

Thanks.
Never used that until now. It shows correctly that files are identical. Fast enough for local comparisons...
(I note that there is an additional docs css rule in the ZC157 checkout compared to the release.)

I want this comparison to compare the ongoing ZC158 changes with a reference ZC157 installation and production shop etc.

[mc12345678]

Thanks.
Never used that until now. It shows correctly that files are identical. Fast enough for local comparisons...
(I note that there is an additional docs css rule in the ZC157 checkout compared to the release.)

I want this comparison to compare the ongoing ZC158 changes with a reference ZC157 installation and production shop etc.

In reference to the additional css file, are you comparing the v157 branch to the release or the tagged v1.5.7?

As a side note, versions may have additional files/changes that are not part of the latest release... v156 compared to v1.5.6f is an example... Basically changes "prepped" to support a future sub-release, whether that release occurs or not...

While I understand the emphasis on local as associated to a previous comment, I point out that the comparison works for local to remote or remote to remote as well...

[torvista]

comparing the v157 branch to the release

Yes

[torvista]

Git line endings

turns out it's doing exactly what it's supposed to do: translate to your local machine based on your machine's configuration.

Yes, I got that. But is it not doing that based on the .gitattributes of the fileset, not the machine configuration?

My scenario is
1) my new shop starts with a sourceforge fileset: unix endings.
2) I merge my mods in from the current production shop, taking care to convert these to unix endings.
3) over time, new things appear in Github v158 that I may want to merge in too: but these checkout automatically converted to Windows endings as per the .gitattributes "* text=auto" that is in the github fileset. So any file I want to merge, I'll have to convert manually.

So if I want to stop Git checkout converting the checkout to windows endings, I suppose I need to change the gitattributes "* text command....but if it is part of the fileset, how can I do that/override it?