javascript-tutorial / javascript-tutorial/ar.javascript.info

Merging Conflicts

Open
#181 1 comment 0 reactions 0 assignees View on GitHub
Dominant language
HTML
Stars
64
Forks
64
PR merge metrics
No merged PRs in 30d

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
![image](https://user-images.githubusercontent.com/8146344/112454928-e055de00-8d61-11eb-956a-b994133292c2.png)

Contributor guide

No contributing guide indexed for this repository

Research direction

The issue provides only a screenshot and does not name any files, tests, or entry points. First identify which upstream branch and files contain the conflicts, then clarify whether the goal is to document the sync workflow or resolve a specific repository state; done should be defined as an agreed resolution and a successful upstream sync.

Written by the indexing model from the issue text.

Assessment

Tech stack
git
Domain
tooling
Issue type
Documentation
Difficulty
3/5
Estimated time
1-2 days
Activity status
Stale
Clarity
Needs clarification
Newbie friendliness
20/100

Get new issues in your inbox

A short digest of beginner-friendly GitHub issues.