Title: Merging Conflicts · Issue #181 · javascript-tutorial/ar.javascript.info · GitHub
Open Graph Title: Merging Conflicts · Issue #181 · javascript-tutorial/ar.javascript.info
X Title: Merging Conflicts · Issue #181 · javascript-tutorial/ar.javascript.info
Description: I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan How to fix this
Open Graph Description: I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan How to fix this
X Description: I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan How to fix this
Opengraph URL: https://github.com/javascript-tutorial/ar.javascript.info/issues/181
X: @github
Domain: github.com
{"@context":"https://schema.org","@type":"DiscussionForumPosting","headline":"Merging Conflicts","articleBody":"I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan \r\nHow to fix this \r\n\r\n","author":{"url":"https://github.com/OmarioHassan","@type":"Person","name":"OmarioHassan"},"datePublished":"2021-03-25T10:01:52.000Z","interactionStatistic":{"@type":"InteractionCounter","interactionType":"https://schema.org/CommentAction","userInteractionCount":1},"url":"https://github.com/181/ar.javascript.info/issues/181"}
| 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:dfa691db-bb6a-ebad-8f36-1f441d3b7daf |
| current-catalog-service-hash | 81bb79d38c15960b92d99bca9288a9108c7a47b18f2423d0f6438c5b7bcd2114 |
| request-id | DD24:35531E:15DD678:1D07456:6982F14C |
| html-safe-nonce | 15ac6c8c4d2f303e48614e42289ce6b83b96d0cde60986f9b2a1fdbd876ae7f6 |
| visitor-payload | eyJyZWZlcnJlciI6IiIsInJlcXVlc3RfaWQiOiJERDI0OjM1NTMxRToxNURENjc4OjFEMDc0NTY6Njk4MkYxNEMiLCJ2aXNpdG9yX2lkIjoiMzQ3ODIzMjc1MTkzOTk3MzQ1MyIsInJlZ2lvbl9lZGdlIjoiaWFkIiwicmVnaW9uX3JlbmRlciI6ImlhZCJ9 |
| visitor-hmac | 4f23854d6fb7d5130c7eeca442b08d791b74baf85fe557bac8dbf1562755537c |
| hovercard-subject-tag | issue:840763223 |
| 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/javascript-tutorial/ar.javascript.info/181/issue_layout |
| twitter:image | https://opengraph.githubassets.com/d279220889ac785e7edcee4b15da8f3383189ff4c55a2a9421fa50ec531f52ba/javascript-tutorial/ar.javascript.info/issues/181 |
| twitter:card | summary_large_image |
| og:image | https://opengraph.githubassets.com/d279220889ac785e7edcee4b15da8f3383189ff4c55a2a9421fa50ec531f52ba/javascript-tutorial/ar.javascript.info/issues/181 |
| og:image:alt | I'm trying to Sync with upstream and found that there are a lot of conflicts are merged by @iliakan How to fix this |
| og:image:width | 1200 |
| og:image:height | 600 |
| og:site_name | GitHub |
| og:type | object |
| og:author:username | OmarioHassan |
| hostname | github.com |
| expected-hostname | github.com |
| None | c6741528aa4d4ba81c57bbff8f8cc0de0e9115cb2993431dc9dac8d489f7b4ee |
| turbo-cache-control | no-preview |
| go-import | github.com/javascript-tutorial/ar.javascript.info git https://github.com/javascript-tutorial/ar.javascript.info.git |
| octolytics-dimension-user_id | 49552305 |
| octolytics-dimension-user_login | javascript-tutorial |
| octolytics-dimension-repository_id | 202420542 |
| octolytics-dimension-repository_nwo | javascript-tutorial/ar.javascript.info |
| octolytics-dimension-repository_public | true |
| octolytics-dimension-repository_is_fork | false |
| octolytics-dimension-repository_network_root_id | 202420542 |
| octolytics-dimension-repository_network_root_nwo | javascript-tutorial/ar.javascript.info |
| 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 | df2a3cea9cc9adaf422cd462f5351935c407af4d |
| ui-target | full |
| theme-color | #1e2327 |
| color-scheme | light dark |
Links:
Viewport: width=device-width