Ok so basically what I want to know is, let's say that when Intersect goes open source I clone it and make a bunch of changes. When Intersect gets updated is it possible for me to get the update while also keeping the changes that I have made on my end? If so how do conflicts get resolved in that case? Does it only depend on how smart and modular the code I've added is?
I don't need some big explanation on how git works in general, just this piece of information if possible
Thanks in advance!