Mark the given path as resolved.
(self, path)
| 866 | raise GlError('File {0} in unknown status {1}'.format(path, git_st)) |
| 867 | |
| 868 | def resolve_file(self, path): |
| 869 | """Mark the given path as resolved.""" |
| 870 | _check_path_is_repo_relative(path) |
| 871 | |
| 872 | gl_st, _, _ = self._status_file(path) |
| 873 | if not gl_st.in_conflict: |
| 874 | raise ValueError('File {0} has no conflicts'.format(path)) |
| 875 | |
| 876 | with self._index as index: |
| 877 | git_path = _get_git_path(path) |
| 878 | index.add(git_path) |
| 879 | |
| 880 | def checkout_file(self, path, commit): |
| 881 | """Checkouts the given path at the given commit.""" |