[DiscordArchive] may I suggest dos2unix or unix2dos if you're on Linux or OSX?
[DiscordArchive] may I suggest dos2unix or unix2dos if you're on Linux or OSX?
Archived author: chipzz • Posted: 2024-03-16T18:17:31.894000+00:00
Original source
If you don't, then every line will be marked as a change even if there is no real change, because the line endings differ
Archived author: Foe • Posted: 2024-03-16T18:18:15.725000+00:00
Original source
No
Archived author: chipzz • Posted: 2024-03-16T18:18:18.494000+00:00
Original source
I use rebases exclusively so don't ever merge, so yeah, it's possible I'm talking out of my ass
Archived author: Tea • Posted: 2024-03-16T18:18:51.778000+00:00
Original source
but do you maintain a patch/repo meant for other users to... use? if yes then absolutely do not rebase
Archived author: chipzz • Posted: 2024-03-16T18:19:15.305000+00:00
Original source
No, my client isn't publically available in git form
Archived author: chipzz • Posted: 2024-03-16T18:19:46.209000+00:00
Original source
My rebasing is one of the reasons why it isn't
Archived author: Infectious • Posted: 2024-03-16T18:20:07.675000+00:00
Original source
Well from yall conversation i believe im fucked
Archived author: Infectious • Posted: 2024-03-16T18:20:10.103000+00:00
Original source
Thanks anyways
Archived author: chipzz • Posted: 2024-03-16T18:20:34.079000+00:00
Original source
Not necessarily, but it's gonna take some effort to unfuck
Archived author: Tea • Posted: 2024-03-16T18:20:35.917000+00:00
Original source
we arent even discussing your "issue?" at all anymore