Title: Question about Index.conflictGet method · Issue #1193 · nodegit/nodegit · GitHub
Open Graph Title: Question about Index.conflictGet method · Issue #1193 · nodegit/nodegit
X Title: Question about Index.conflictGet method · Issue #1193 · nodegit/nodegit
Description: Hi there, When I was trying to use index.conflictAdd() to update the conflict files, I found ancestor_index, their_index and our_index are needed. However, I could only get their_index by using conflictGet() method and found no way to ge...
Open Graph Description: Hi there, When I was trying to use index.conflictAdd() to update the conflict files, I found ancestor_index, their_index and our_index are needed. However, I could only get their_index by using con...
X Description: Hi there, When I was trying to use index.conflictAdd() to update the conflict files, I found ancestor_index, their_index and our_index are needed. However, I could only get their_index by using con...
Opengraph URL: https://github.com/nodegit/nodegit/issues/1193
X: @github
Domain: github.com
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Question about Index.conflictGet method","articleBody":"Hi there,\r\nWhen I was trying to use index.conflictAdd() to update the conflict files, I found ancestor_index, their_index and our_index are needed. However, I could only get their_index by using conflictGet() method and found no way to get the other two indexes. And I found in libgit2, git_index_conflict_get would help us get all the indexes. So is there any way in nodegit for us to find out are the 3 indexes?\r\nThanks a lot.","author":{"url":"https://github.com/zyu539","@type":"Person","name":"zyu539"},"datePublished":"2017-01-22T10:55:36Z","url":"https://github.com/nodegit/nodegit/issues/1193"}
| react-profiling | 0 |
| react-import-map | react,react-dom,react-dom/client,react-dom/profiling,react-is,react/compiler-runtime,react/jsx-dev-runtime,react/jsx-runtime,scheduler@b8488ee2c322 |
| route-pattern | /_view_fragments/issues/show/:user_id/:repository/:id/issue_layout(.:format) |
| route-controller | voltron_issues_fragments |
| route-action | issue_layout |
| fetch-nonce | v2:86a64826-69ea-d5a8-05fb-40c9295722e9 |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | A4A0:6B763:29D617:3C7E59:6AFD7AFE |
| html-safe-nonce | 3be1cf6d886ffbe7adf816a17cb8ea071d7add93a6d93aad399f6c580ebb8af0 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJBNEEwOjZCNzYzOjI5RDYxNzozQzdFNTk6NkFGRDdBRkUiLCJ2aXNpdG9yX2lkIjoiMTIzMzYyMDk3NDA3MTI4MjQzMCIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9 |
| visitor-hmac | e1653ce7095f1c84b2abf216dc51e46b6a86c65fea47608ef1260e35f7d04b84 |
| hovercard-subject-tag | issue:202375876 |
| github-keyboard-shortcuts | repository,issues,copilot |
| google-site-verification | Apib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I |
| octolytics-url | https://collector.github.com/github/collect |
| analytics-location | / |
| fb:app_id | 1401488693436528 |
| apple-itunes-app | app-id=1477376905, app-argument=https://github.com/_view_fragments/issues/show/nodegit/nodegit/1193/issue_layout |
| twitter:image | https://opengraph.githubassets.com/502561566ff98bb06cf30a8151db25b325e732758a4e3bd6d9c9f731229aa2ec/nodegit/nodegit/issues/1193 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/502561566ff98bb06cf30a8151db25b325e732758a4e3bd6d9c9f731229aa2ec/nodegit/nodegit/issues/1193 |
| og:image:alt | Hi there, When I was trying to use index.conflictAdd() to update the conflict files, I found ancestor_index, their_index and our_index are needed. However, I could only get their_index by using con... |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | zyu539 |
| hostname | github.com |
| expected-hostname | github.com |
| None | 544ff6b59bd215c4609120f6e334dbd0b00d34fb6f8bc03a476f72256998887e |
| turbo-cache-control | no-preview |
| go-import | github.com/nodegit/nodegit git https://github.com/nodegit/nodegit.git |
| octolytics-dimension-user_id | 657068 |
| octolytics-dimension-user_login | nodegit |
| octolytics-dimension-repository_id | 1383170 |
| octolytics-dimension-repository_nwo | nodegit/nodegit |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 1383170 |
| octolytics-dimension-repository_network_root_nwo | nodegit/nodegit |
| turbo-body-classes | logged-out env-production page-responsive |
| disable-turbo | false |
| browser-stats-url | https://api.github.com/_private/browser/stats |
| browser-errors-url | https://api.github.com/_private/browser/errors |
| release | 71c92f8b27ec5e9aa6f6477b4e067a4727fc9edb |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
| react-app-name | issues |
Links:
Viewport: width=device-width