branch-puller

Pull branches from remote repository with intelligent conflict resolution