René's URL Explorer Experiment


Title: merge: reload index before git_merge by Etiene · Pull Request #4407 · libgit2/libgit2 · GitHub

Open Graph Title: merge: reload index before git_merge by Etiene · Pull Request #4407 · libgit2/libgit2

X Title: merge: reload index before git_merge by Etiene · Pull Request #4407 · libgit2/libgit2

Description: A cross-platform, linkable library implementation of Git that you can use in your application. - merge: reload index before git_merge by Etiene · Pull Request #4407 · libgit2/libgit2

Open Graph Description: When the index in memory diverges from the index in disk git_merge aborts with GIT_ECONFLICT. More details about this are found in the issue #4203, which this PR attempts to fix. A further discussi...

X Description: When the index in memory diverges from the index in disk git_merge aborts with GIT_ECONFLICT. More details about this are found in the issue #4203, which this PR attempts to fix. A further discussi...

Opengraph URL: https://github.com/libgit2/libgit2/pull/4407

X: @github

direct link

Domain: github.com

route-pattern/_view_fragments/voltron/pull_requests/show/:user_id/:repository/:id/pull_request_layout(.:format)
route-controllervoltron_pull_requests_fragments
route-actionpull_request_layout
fetch-noncev2:92855275-204c-a14c-6505-2081322a5046
current-catalog-service-hashae870bc5e265a340912cde392f23dad3671a0a881730ffdadd82f2f57d81641b
request-id8264:2F7044:6518D88:8B7E133:6A5E841B
html-safe-nonce923a4db2638f30965b00e13eb5b467b5b8fb6c0ce9a693624c7637a223a1ecd9
visitor-payloadeyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiI4MjY0OjJGNzA0NDo2NTE4RDg4OjhCN0UxMzM6NkE1RTg0MUIiLCJ2aXNpdG9yX2lkIjoiNzI4OTE2MTc5OTI0NTM5OTA2NyIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9
visitor-hmacea942b8e3bc0ebccb4bab64d1e5d91ddd80e33d78438d22de57f823e8d707a3f
hovercard-subject-tagpull_request:152067265
github-keyboard-shortcutsrepository,pull-request-list,pull-request-conversation,pull-request-files-changed,copilot
google-site-verificationApib7-x98H0j5cPqHWwSMm6dNU4GmODRoqxLiDzdx9I
octolytics-urlhttps://collector.github.com/github/collect
analytics-location///voltron/pull_requests_fragments/pull_request_layout
fb:app_id1401488693436528
apple-itunes-appapp-id=1477376905, app-argument=https://github.com/_view_fragments/voltron/pull_requests/show/libgit2/libgit2/4407/pull_request_layout
twitter:imagehttps://opengraph.githubassets.com/76d41761a834f6b397b9e90586ec3cb5cf3339520efe93c5ea35fa9adba25dc3/libgit2/libgit2/pull/4407
twitter:cardsummary_large_image
og:imagehttps://opengraph.githubassets.com/76d41761a834f6b397b9e90586ec3cb5cf3339520efe93c5ea35fa9adba25dc3/libgit2/libgit2/pull/4407
og:image:altWhen the index in memory diverges from the index in disk git_merge aborts with GIT_ECONFLICT. More details about this are found in the issue #4203, which this PR attempts to fix. A further discussi...
og:image:width1200
og:image:height600
og:site_nameGitHub
og:typeobject
og:author:usernameEtiene
hostnamegithub.com
expected-hostnamegithub.com
Nonee0c30ec4bc4cc128be7eee7ef869507723a2ac9916267b7e0d370b3580a5e7ba
turbo-cache-controlno-cache
go-importgithub.com/libgit2/libgit2 git https://github.com/libgit2/libgit2.git
octolytics-dimension-user_id394745
octolytics-dimension-user_loginlibgit2
octolytics-dimension-repository_id901662
octolytics-dimension-repository_nwolibgit2/libgit2
octolytics-dimension-repository_publictrue
octolytics-dimension-repository_is_forkfalse
octolytics-dimension-repository_network_root_id901662
octolytics-dimension-repository_network_root_nwolibgit2/libgit2
turbo-body-classeslogged-out env-production page-responsive
disable-turbofalse
browser-stats-urlhttps://api.github.com/_private/browser/stats
browser-errors-urlhttps://api.github.com/_private/browser/errors
release68ef39d284f7f48d37e751bc9bc0a9a4166228d5
ui-targetfull
theme-color#1e2327
color-schemelight dark

Links:

Skip to contenthttps://github.com/libgit2/libgit2/pull/4407#start-of-content
https://github.com/
Sign in https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Flibgit2%2Flibgit2%2Fpull%2F4407
GitHub CopilotWrite better code with AIhttps://github.com/features/copilot
GitHub Copilot appDirect agents from issue to mergehttps://github.com/features/ai/github-app
MCP RegistryNewIntegrate external toolshttps://github.com/mcp
ActionsAutomate any workflowhttps://github.com/features/actions
CodespacesInstant dev environmentshttps://github.com/features/codespaces
IssuesPlan and track workhttps://github.com/features/issues
Code ReviewManage code changeshttps://github.com/features/code-review
Code QualityEnforce quality at mergehttps://github.com/features/code-quality
GitHub Advanced SecurityFind and fix vulnerabilitieshttps://github.com/security/advanced-security
Code securitySecure your code as you buildhttps://github.com/security/advanced-security/code-security
Secret protectionStop leaks before they starthttps://github.com/security/advanced-security/secret-protection
Why GitHubhttps://github.com/why-github
Documentationhttps://docs.github.com
Bloghttps://github.blog
Changeloghttps://github.blog/changelog
Marketplacehttps://github.com/marketplace
View all featureshttps://github.com/features
Enterpriseshttps://github.com/enterprise
Small and medium teamshttps://github.com/team
Startupshttps://github.com/enterprise/startups
Nonprofitshttps://github.com/solutions/industry/nonprofits
App Modernizationhttps://github.com/solutions/use-case/app-modernization
DevSecOpshttps://github.com/solutions/use-case/devsecops
DevOpshttps://github.com/solutions/use-case/devops
CI/CDhttps://github.com/solutions/use-case/ci-cd
View all use caseshttps://github.com/solutions/use-case
Healthcarehttps://github.com/solutions/industry/healthcare
Financial serviceshttps://github.com/solutions/industry/financial-services
Manufacturinghttps://github.com/solutions/industry/manufacturing
Governmenthttps://github.com/solutions/industry/government
View all industrieshttps://github.com/solutions/industry
View all solutionshttps://github.com/solutions
AIhttps://github.com/resources/articles?topic=ai
Software Developmenthttps://github.com/resources/articles?topic=software-development
DevOpshttps://github.com/resources/articles?topic=devops
Securityhttps://github.com/resources/articles?topic=security
View all topicshttps://github.com/resources/articles
Customer storieshttps://github.com/customer-stories
Events & webinarshttps://github.com/resources/events
Ebooks & reportshttps://github.com/resources/whitepapers
Business insightshttps://github.com/solutions/executive-insights
GitHub Skillshttps://skills.github.com
Documentationhttps://docs.github.com
Customer supporthttps://support.github.com
Community forumhttps://github.com/orgs/community/discussions
Trust centerhttps://github.com/trust-center
Partnershttps://github.com/partners
View all resourceshttps://github.com/resources
GitHub SponsorsFund open source developershttps://github.com/open-source/sponsors
Security Labhttps://securitylab.github.com
Maintainer Communityhttps://maintainers.github.com
Acceleratorhttps://github.com/open-source/accelerator
GitHub Starshttps://stars.github.com
Archive Programhttps://archiveprogram.github.com
Topicshttps://github.com/topics
Trendinghttps://github.com/trending
Collectionshttps://github.com/collections
Enterprise platformAI-powered developer platformhttps://github.com/enterprise
GitHub Advanced SecurityEnterprise-grade security featureshttps://github.com/security/advanced-security
Copilot for BusinessEnterprise-grade AI featureshttps://github.com/features/copilot/copilot-business
Premium SupportEnterprise-grade 24/7 supporthttps://github.com/enterprise/premium-support
Pricinghttps://github.com/pricing
Search syntax tipshttps://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax
documentationhttps://docs.github.com/search-github/github-code-search/understanding-github-code-search-syntax
Sign in https://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Flibgit2%2Flibgit2%2Fpull%2F4407
Sign up https://github.com/signup?ref_cta=Sign+up&ref_loc=header+logged+out&ref_page=%2F%3Cuser-name%3E%2F%3Crepo-name%3E%2Fvoltron%2Fpull_requests_fragments%2Fpull_request_layout&source=header-repo&source_repo=libgit2%2Flibgit2
Reloadhttps://github.com/libgit2/libgit2/pull/4407
Reloadhttps://github.com/libgit2/libgit2/pull/4407
Reloadhttps://github.com/libgit2/libgit2/pull/4407
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
libgit2 https://github.com/libgit2
libgit2https://github.com/libgit2/libgit2
Notifications https://github.com/login?return_to=%2Flibgit2%2Flibgit2
Fork 2.6k https://github.com/login?return_to=%2Flibgit2%2Flibgit2
Star 10.5k https://github.com/login?return_to=%2Flibgit2%2Flibgit2
Code https://github.com/libgit2/libgit2
Issues 423 https://github.com/libgit2/libgit2/issues
Pull requests 109 https://github.com/libgit2/libgit2/pulls
Discussions https://github.com/libgit2/libgit2/discussions
Actions https://github.com/libgit2/libgit2/actions
Projects https://github.com/libgit2/libgit2/projects
Security and quality 9 https://github.com/libgit2/libgit2/security
Insights https://github.com/libgit2/libgit2/pulse
Code https://github.com/libgit2/libgit2
Issues https://github.com/libgit2/libgit2/issues
Pull requests https://github.com/libgit2/libgit2/pulls
Discussions https://github.com/libgit2/libgit2/discussions
Actions https://github.com/libgit2/libgit2/actions
Projects https://github.com/libgit2/libgit2/projects
Security and quality https://github.com/libgit2/libgit2/security
Insights https://github.com/libgit2/libgit2/pulse
ethomsonhttps://github.com/ethomson
libgit2:masterhttps://github.com/libgit2/libgit2/tree/master
Etiene:issue-4203https://github.com/Etiene/libgit2/tree/issue-4203
Conversationhttps://github.com/libgit2/libgit2/pull/4407
Commits3 (3)https://github.com/libgit2/libgit2/pull/4407/commits
Checkshttps://github.com/libgit2/libgit2/pull/4407/checks
Files changedhttps://github.com/libgit2/libgit2/pull/4407/files
merge: reload index before git_mergehttps://github.com/libgit2/libgit2/pull/4407#top
ethomsonhttps://github.com/ethomson
libgit2:masterhttps://github.com/libgit2/libgit2/tree/master
Etiene:issue-4203https://github.com/Etiene/libgit2/tree/issue-4203
https://github.com/Etiene
Etienehttps://github.com/Etiene
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#issue-273163025
#4203https://github.com/libgit2/libgit2/issues/4203
#4203https://github.com/libgit2/libgit2/issues/4203
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/pks-t
pks-thttps://github.com/pks-t
Nov 11, 2017 https://github.com/libgit2/libgit2/pull/4407#pullrequestreview-75937793
View reviewed changes https://github.com/libgit2/libgit2/pull/4407/files
pks-thttps://github.com/pks-t
https://github.com/libgit2/libgit2/pull/4407#pullrequestreview-75937793
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
src/merge.chttps://github.com/libgit2/libgit2/pull/4407/files#diff-411579923ce3d2d33e8a4b5cc3b2b859fdf51bc316f7ead0d96078f086f13e93
pks-thttps://github.com/pks-t
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#discussion_r150389344
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
pks-thttps://github.com/pks-t
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#discussion_r150389407
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
ethomsonhttps://github.com/ethomson
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#discussion_r150389829
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
src/merge.chttps://github.com/libgit2/libgit2/pull/4407/files#diff-411579923ce3d2d33e8a4b5cc3b2b859fdf51bc316f7ead0d96078f086f13e93
pks-thttps://github.com/pks-t
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#discussion_r150389435
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
tests/merge/workdir/simple.chttps://github.com/libgit2/libgit2/pull/4407/files#diff-c8aa4150f3bdd99d8af1cc5bbfd16422d659d3e899043b333aa6b3cd0b08cf53
pks-thttps://github.com/pks-t
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#discussion_r150389456
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-343683717
@pks-thttps://github.com/pks-t
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Nov 11, 2017 https://github.com/libgit2/libgit2/pull/4407#pullrequestreview-75938345
View reviewed changes https://github.com/libgit2/libgit2/pull/4407/files
src/merge.chttps://github.com/libgit2/libgit2/pull/4407/files#diff-411579923ce3d2d33e8a4b5cc3b2b859fdf51bc316f7ead0d96078f086f13e93
ethomsonhttps://github.com/ethomson
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#discussion_r150389861
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/pks-t
pks-thttps://github.com/pks-t
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-343686884
@ethomsonhttps://github.com/ethomson
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
GC8https://github.com/GC8
November 11, 2017 19:31https://github.com/libgit2/libgit2/pull/4407#commits-pushed-bb9e379
https://github.com/GC8
https://github.com/Etiene
merge: reload index before git_mergehttps://github.com/libgit2/libgit2/pull/4407/commits/bb9e3797ba08c8cb0e88b2e1dc63959fa8f084a9
bb9e379https://github.com/libgit2/libgit2/pull/4407/commits/bb9e3797ba08c8cb0e88b2e1dc63959fa8f084a9
libgit2#4203https://github.com/libgit2/libgit2/issues/4203
https://github.com/Etiene
tests: add test case for index reloads on mergehttps://github.com/libgit2/libgit2/pull/4407/commits/5248a1a5836707c33f2543f46f9e2254c03628cd
5248a1ahttps://github.com/libgit2/libgit2/pull/4407/commits/5248a1a5836707c33f2543f46f9e2254c03628cd
libgit2#4203https://github.com/libgit2/libgit2/issues/4203
https://github.com/Etiene
Etienehttps://github.com/Etiene
force-pushedhttps://github.com/libgit2/libgit2/compare/b2040dec42ace298d38bfb89e5eac68afe4c4817..650d51d88a8571782612ae64b1adcabc990d5c11
b2040dehttps://github.com/libgit2/libgit2/commit/b2040dec42ace298d38bfb89e5eac68afe4c4817
650d51dhttps://github.com/libgit2/libgit2/commit/650d51d88a8571782612ae64b1adcabc990d5c11
Compare https://github.com/libgit2/libgit2/compare/b2040dec42ace298d38bfb89e5eac68afe4c4817..650d51d88a8571782612ae64b1adcabc990d5c11
November 11, 2017 19:32https://github.com/libgit2/libgit2/pull/4407#event-1337338065
https://github.com/Etiene
merge: add error handling for index reloadhttps://github.com/libgit2/libgit2/pull/4407/commits/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
e8d373chttps://github.com/libgit2/libgit2/pull/4407/commits/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
https://github.com/Etiene
Etienehttps://github.com/Etiene
force-pushedhttps://github.com/libgit2/libgit2/compare/650d51d88a8571782612ae64b1adcabc990d5c11..e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
650d51dhttps://github.com/libgit2/libgit2/commit/650d51d88a8571782612ae64b1adcabc990d5c11
e8d373chttps://github.com/libgit2/libgit2/commit/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
Compare https://github.com/libgit2/libgit2/compare/650d51d88a8571782612ae64b1adcabc990d5c11..e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
November 11, 2017 19:44https://github.com/libgit2/libgit2/pull/4407#event-1337341945
https://github.com/Etiene
Etienehttps://github.com/Etiene
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-343689434
@pks-thttps://github.com/pks-t
@ethomsonhttps://github.com/ethomson
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-343690659
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/Etiene
Etienehttps://github.com/Etiene
Nov 11, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-343691323
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/pks-t
pks-thttps://github.com/pks-t
bloomberg https://github.com/libgit2/libgit2/issues?q=state%3Aopen%20label%3Abloomberg
Nov 12, 2017https://github.com/libgit2/libgit2/pull/4407#event-1337552198
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Nov 17, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-345108466
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/Etiene
Etienehttps://github.com/Etiene
Nov 17, 2017https://github.com/libgit2/libgit2/pull/4407#issuecomment-345230539
@ethomsonhttps://github.com/ethomson
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Feb 19, 2018 https://github.com/libgit2/libgit2/pull/4407#ref-pullrequest-298134452
Add a "dirty" state to the index when it has unsaved changes #4536 https://github.com/libgit2/libgit2/pull/4536
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Jun 30, 2018https://github.com/libgit2/libgit2/pull/4407#issuecomment-401547025
#4536https://github.com/libgit2/libgit2/pull/4536
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Jun 30, 2018 https://github.com/libgit2/libgit2/pull/4407#pullrequestreview-133428543
View reviewed changes https://github.com/libgit2/libgit2/pull/4407/files/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
src/merge.chttps://github.com/libgit2/libgit2/pull/4407/files/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c#diff-411579923ce3d2d33e8a4b5cc3b2b859fdf51bc316f7ead0d96078f086f13e93
ethomsonhttps://github.com/ethomson
Jun 30, 2018https://github.com/libgit2/libgit2/pull/4407#discussion_r199324888
Learn morehttps://docs.github.com/articles/managing-disruptive-comments/#hiding-a-comment
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Oct 19, 2018https://github.com/libgit2/libgit2/pull/4407#issuecomment-431320260
@Etienehttps://github.com/Etiene
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
e8d373chttps://github.com/libgit2/libgit2/commit/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
Oct 20, 2018https://github.com/libgit2/libgit2/pull/4407#event-1916350003
https://github.com/ethomson
ethomsonhttps://github.com/ethomson
Oct 20, 2018https://github.com/libgit2/libgit2/pull/4407#issuecomment-431610669
@Etienehttps://github.com/Etiene
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.co/hiddenchars
https://github.com/libgit2/libgit2/pull/{{ revealButtonHref }}
Sign up for freehttps://github.com/join?source=comment-repo
Sign in to commenthttps://github.com/login?return_to=https%3A%2F%2Fgithub.com%2Flibgit2%2Flibgit2%2Fpull%2F4407
https://github.com/ethomson
ethomson https://github.com/ethomson
https://github.com/libgit2/libgit2/pull/4407/files/e8d373c4feb9cddc9cc2e50e2f486bc7ef6bcf9c
https://github.com/pks-t
pks-t https://github.com/pks-t
https://github.com/libgit2/libgit2/pull/4407/files/b2040dec42ace298d38bfb89e5eac68afe4c4817
git_merge needs to reload the index https://github.com/libgit2/libgit2/issues/4203
Please reload this pagehttps://github.com/libgit2/libgit2/pull/4407
https://github.com/Etiene
https://github.com/ethomson
https://github.com/pks-t
https://github.com/GC8
https://github.com
Termshttps://docs.github.com/site-policy/github-terms/github-terms-of-service
Privacyhttps://docs.github.com/site-policy/privacy-policies/github-privacy-statement
Securityhttps://github.com/security
Statushttps://www.githubstatus.com/
Communityhttps://github.community/
Docshttps://docs.github.com/
Contacthttps://support.github.com?tags=dotcom-footer

Viewport: width=device-width

URLs of crawlers that visited me.