puli / manager

        // Mark all as resolved

        foreach ($this->repositoryPaths as $repositoryPath) {

            if ($this->conflicts->has($repositoryPath)) {

                $conflict = $this->conflicts->get($repositoryPath);

                $this->conflicts->remove($repositoryPath);

                $this->removedConflicts[$repositoryPath] = $conflict->getMappings();

                $conflict->resolve();

            }

        }

        $moduleConflicts = $this->conflictDetector->detectConflicts($this->repositoryPaths);

    public function rollback()

    {

        foreach ($this->addedConflicts as $repositoryPath) {

            if ($this->conflicts->has($repositoryPath)) {

                $conflict = $this->conflicts->get($repositoryPath);

                $conflict->resolve();

                $this->conflicts->remove($repositoryPath);

            }

        }

        foreach ($this->removedConflicts as $repositoryPath => $conflictingMappings) {