Title: cherry-pick · guui-programmers · Discussion #20 · GitHub
Open Graph Title: cherry-pick · guui-programmers · Discussion #20
X Title: cherry-pick · guui-programmers · Discussion #20
Description: cherry-pick
Open Graph Description: git cherry-pick 에서 충돌 일어났을 때 어떻게 해결해야 되져..???
X Description: git cherry-pick 에서 충돌 일어났을 때 어떻게 해결해야 되져..???
Opengraph URL: https://github.com/orgs/guui-programmers/discussions/20
X: @github
Domain: patch-diff.githubusercontent.com
{"@context":"https://schema.org","@type":"QAPage","mainEntity":{"@type":"Question","name":"cherry-pick","text":"git cherry-pick 에서 충돌 일어났을 때 어떻게 해결해야 되져..???
","upvoteCount":2,"answerCount":1,"acceptedAnswer":{"@type":"Answer","text":"First you should undo your cherry-pick, try to run this
\ngit cherry-pick --abort\n
\nSecond, try to make cherry-pick, but in this time you get their changes not yours, so make this:
\ngit cherry-pick --strategy=recursive -X theirs {Imported_Commit}\n
","upvoteCount":1,"url":"https://github.com/orgs/guui-programmers/discussions/20#discussioncomment-3084909"}}}| route-pattern | /orgs/:org/discussions/:number(.:format) |
| route-controller | discussions |
| route-action | show |
| fetch-nonce | v2:7f30c42c-ac5a-e57d-f091-74d1743e65ac |
| current-catalog-service-hash | 9f0abe34da433c9b6db74bffa2466494a717b579a96b30a5d252e5090baea7be |
| request-id | AA46:1647C7:10BB99:16213D:698F9DEC |
| html-safe-nonce | b0c75c1ef0b1bf62990655cbd5a141419b3e071dd850edd22856c13b44973e2f |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJBQTQ2OjE2NDdDNzoxMEJCOTk6MTYyMTNEOjY5OEY5REVDIiwidmlzaXRvcl9pZCI6IjMyMDkyMDQyNDI1NjE2MDUxMDAiLCJyZWdpb25fZWRnZSI6ImlhZCIsInJlZ2lvbl9yZW5kZXIiOiJpYWQifQ== |
| visitor-hmac | d5508419cd5a642b8d9d92350a5ab329530fc6356ff246bd7cade4431c2caf6e |
| hovercard-subject-tag | discussion:4194882 |
| github-keyboard-shortcuts | repository,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/orgs/guui-programmers/discussions/20 |
| twitter:image | https://opengraph.githubassets.com/5a26aaeb8ce31b151c5167c7a62494ebad07d06833a70391e0a3dfd03882fb51/orgs/guui-programmers/discussions/20 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/5a26aaeb8ce31b151c5167c7a62494ebad07d06833a70391e0a3dfd03882fb51/orgs/guui-programmers/discussions/20 |
| og:image:alt | git cherry-pick 에서 충돌 일어났을 때 어떻게 해결해야 되져..??? |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| hostname | github.com |
| expected-hostname | github.com |
| None | 5f47eb8d0aaafbfcb6a8220a40bd81431acf688857c575e6489670c394cfa36f |
| turbo-cache-control | no-preview |
| octolytics-dimension-user_id | 107044434 |
| octolytics-dimension-user_login | guui-programmers |
| octolytics-dimension-repository_id | 500818121 |
| octolytics-dimension-repository_nwo | guui-programmers/Programmers-Algorithm |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 500818121 |
| octolytics-dimension-repository_network_root_nwo | guui-programmers/Programmers-Algorithm |
| 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 | 17aba3d160d69b8c2b37695ebd174d8101af8896 |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width