always try and get my PR merged before anyone else
You're viewing a single thread.
Git porcelain like magit make dealing with conflicts a lot more bearable.
