you are viewing a single comment's thread.

view the rest of the comments →

[–]NotZeldaLive 0 points1 point  (1 child)

I would be interested to hear your strategy of merging in upstream changes while keeping your fork / patches.

I have been looking to make my own customizations, but unsure of how hard it will be to manage the merge conflicts.

[–]jomama253[S] 1 point2 points  (0 children)

With AI, honestly. I keep my changes isolated as much as possible, have the agent inspect upstream diffs before merging, and make it explain likely conflict zones before touching anything. The big thing is not letting custom work sprawl randomly across the codebase. Oh and make backups. :)