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
merge that with this
to make this
my brain prefers something with a GUI
example
C#:
original line of code
this line should be retainedmerge that with this
C#:
original line of code
new line from forkto make this
C#:
original line of code
this line should be retained
new line from fork