search

NOAA-EDAB / tech-doc

Technical documentation for ecosystem reporting
https://noaa-edab.github.io/tech-doc
Other
8 stars 9 forks source link

Line endings #66

Closed kimberly-bastille closed 2 years ago

kimberly-bastille commented 4 years ago

The line endings between difference systems are creating issues with tracking changes between commits.

.gitattributes added to fix this using advice from help.github but since that change we are still having issues between Windows and Linux.

@sgaichas is this happening if you pull from Mac?

@bbest is this something you have run across before?

slucey commented 4 years ago

@kimberly-bastille I just pushed the SAFMC species chapter back on to the repo and it seems to have tracked the changes. I then nuked my local copy and recloned. Can you change something to that file and we'll test this again.

kimberly-bastille commented 4 years ago

So the changes were correct when I pulled your edits and the push was clean too.

slucey commented 4 years ago

Seems to have worked...for now. Maybe we needed one more push pull to renormalize on my end.

kimberly-bastille commented 4 years ago

Strange though because you had multiple commits since I added the .gitattributes so you must have had some pull/push activity to normalize. Were those commits from changes made in the github interface? or did you push from your local machine?

slucey commented 4 years ago

I had pushed from my local machine. No idea what happened...

kimberly-bastille commented 4 years ago

We should come up with directions for what to do if this happens again. Or add a note about this in our "how we work" documentation.

kimberly-bastille commented 2 years ago

Added how we work wiki outlining the collaboration process for tech doc. Includes notes on past issues and possible solutions.