[DiscordArchive] well, that would have to happen in files that are updated by the repo, yeah? so as long as your pull
[DiscordArchive] well, that would have to happen in files that are updated by the repo, yeah? so as long as your pull
Original source
well, that would have to happen in files that are updated by the repo, yeah? so as long as your pull doesn't have any files you edited, you're good. right?
rektbyfaith
10-12-2023, 06:24 PM #1Archived author: KJack • Posted: 2023-10-12T18:24:38.327000+00:00
Original source
well, that would have to happen in files that are updated by the repo, yeah? so as long as your pull doesn't have any files you edited, you're good. right?
Original source
Well, that's not quite the correct phrase. I have edited plenty of files that regularly gets updated but my code doesn't conflict with changes made in the official repo.
rektbyfaith
10-12-2023, 06:26 PM #2Archived author: Revision • Posted: 2023-10-12T18:26:35.568000+00:00
Original source
Well, that's not quite the correct phrase. I have edited plenty of files that regularly gets updated but my code doesn't conflict with changes made in the official repo.
Original source
It *can* cause conflicts to update the file, it isn't *guaranteed* to. That's my point, nothing more.
rektbyfaith
10-12-2023, 06:29 PM #3Archived author: Revision • Posted: 2023-10-12T18:29:26.547000+00:00
Original source
It *can* cause conflicts to update the file, it isn't *guaranteed* to. That's my point, nothing more.
Original source
AH! Yes, of course you're right. I didn't think about it to that level of detail, but technically if I edit lines 10-20 but lines 50-60 are updated, there is no conflict.
rektbyfaith
10-12-2023, 06:30 PM #4Archived author: KJack • Posted: 2023-10-12T18:30:00.041000+00:00
Original source
AH! Yes, of course you're right. I didn't think about it to that level of detail, but technically if I edit lines 10-20 but lines 50-60 are updated, there is no conflict.
Original source
The good news is that git will let you know if there's a conflict it can't figure out.
rektbyfaith
10-12-2023, 06:30 PM #5Archived author: KJack • Posted: 2023-10-12T18:30:09.372000+00:00
Original source
The good news is that git will let you know if there's a conflict it can't figure out.
Original source
I think I was just confused and felt the need to point it out - I guess I'm used to being very direct and clear with people to avoid confusion. Git is great, even places markers in the conflicting files so you can easily see the difference between the two.
rektbyfaith
10-12-2023, 06:31 PM #6Archived author: Revision • Posted: 2023-10-12T18:31:35.228000+00:00
Original source
I think I was just confused and felt the need to point it out - I guess I'm used to being very direct and clear with people to avoid confusion. Git is great, even places markers in the conflicting files so you can easily see the difference between the two.
Original source
I figured the git newbie didn't care, but as they say, technically correct is the best kind of correct.
rektbyfaith
10-12-2023, 06:32 PM #7Archived author: KJack • Posted: 2023-10-12T18:32:31.562000+00:00
Original source
I figured the git newbie didn't care, but as they say, technically correct is the best kind of correct.
Original source
Most people don't care, that's correct. Oh well, it's cleared up!
rektbyfaith
10-12-2023, 06:33 PM #8Archived author: Revision • Posted: 2023-10-12T18:33:39.805000+00:00
Original source
Most people don't care, that's correct. Oh well, it's cleared up!
1 Guest(s)
1 Guest(s)