Thread: Using Github
View Single Post
Old November 7, 2018, 13:46   #5
fph
Knight
 
Join Date: Apr 2009
Location: Berlin / Italy
Posts: 776
fph is on a distinguished road
Yes, git can merge independent changes to different parts of the same file automatically (as long as the changed parts don't overlap, of course). That's one of the big advantages of version control systems.
__________________
Dive fast, die young, leave a high-CHA corpse.
--
You read a scroll labeled 'lol gtfo' of Teleport Level.
fph is offline   Reply With Quote