Github, merging, and retaining changes

zerodowned

Moderator
ServUO Developer
Jun 28, 2014
1,825
248
63
Ive tried to understand how to do something like merging a fork with a repo and not losing changes to the repo but retain the fork changes.

my brain prefers something with a GUI

example
C#:
original line of code

this line should be retained
merge that with this
C#:
original line of code

new line from fork
to make this
C#:
original line of code

this line should be retained

new line from fork