From Wikipedia, the free encyclopedia
Linux is a family of open source Unix-like operating systems based on the Linux kernel, an operating system kernel first released on September 17, 1991 by Linus Torvalds. Linux is typically packaged in a Linux distribution (or distro for short).
Distributions include the Linux kernel and supporting system software and libraries, many of which are provided by the GNU Project. Many Linux distributions use the word "Linux" in their name, but the Free Software Foundation uses the name GNU/Linux to emphasize the importance of GNU software, causing some controversy.
Community icon by Alpár-Etele Méder, licensed under CC BY 3.0
You pull the origin to your fork and solve the conflicts one by one, that's usually how it goes.
If you want to keep your files how they are you can select "accept local changes" instead of "accept incoming changes". That's it.
Edit: If you need something more detailed let me know, I am assuming you are using an IDE like VSCode
Thanks, I was able to do exactly what I wanted.
Just make sure things are working while doing this. Maybe accepting your changes and the incoming changes is the correct way, but you need to know what you are doing.
You can still merge the whole upstream branch manually with a local clone, and git will stop on each conflict for you to resolve them. Then when it's done you can push the merged branch to your fork.
Use interactive merge or rebase - whatever seems fit to you.
If they don't know how to solve conflicts do you think that they know the difference between merge or rebase?