(path string)
| 600 | } |
| 601 | |
| 602 | func (v *Index) RemoveConflict(path string) error { |
| 603 | |
| 604 | cpath := C.CString(path) |
| 605 | defer C.free(unsafe.Pointer(cpath)) |
| 606 | |
| 607 | runtime.LockOSThread() |
| 608 | defer runtime.UnlockOSThread() |
| 609 | |
| 610 | ecode := C.git_index_conflict_remove(v.ptr, cpath) |
| 611 | runtime.KeepAlive(v) |
| 612 | if ecode < 0 { |
| 613 | return MakeGitError(ecode) |
| 614 | } |
| 615 | return nil |
| 616 | } |
| 617 | |
| 618 | type IndexConflictIterator struct { |
| 619 | doNotCompare |