Basic Git for DBAs: Merging Code Between Branches

If I add a "Stored Procedures" folder to the feature ... Each "developer" added code in different places, so Git merged these together. Easy, right? This may or may not work well.