[DiscordArchive] And, as far as merge conflicts go, will direct merging/patching show you the specific conflicts in q
[DiscordArchive] And, as far as merge conflicts go, will direct merging/patching show you the specific conflicts in q
Archived author: Lexaraj • Posted: 2023-04-17T17:25:41.357000+00:00
Original source
And, as far as merge conflicts go, will direct merging/patching show you the specific conflicts in question and you go from there? Or do you need to look at everything on the modified code to assess what will potentially conflict?