question-mark
Stuck on an issue?

Lightrun Answers was designed to reduce the constant googling that comes with debugging 3rd party libraries. It collects links to all the places you might be looking at while hunting down a tough bug.

And, if you’re still stuck at the end, we’re happy to hop on a call to see how we can help out.

[CI] changelog check failing on PR with unresolved conflicts

See original GitHub issue

For instance: #19540 fails with:

https://github.com/scikit-learn/scikit-learn/pull/19540/checks?check_run_id=1977937609

Run echo "PR_NUMBER=19540" >> $GITHUB_ENV
  echo "PR_NUMBER=19540" >> $GITHUB_ENV
  echo "TAGGED_MILESTONE= >> $GITHUB_ENV
  shell: /usr/bin/bash -e {0}
/home/runner/work/_temp/6f19004d-8375-4b36-bace-92557dca6c17.sh: line 2: unexpected EOF while looking for matching `"'
Error: Process completed with exit code 2.

while it passed on other PRs without conflicts. Hence I suspect that the conflicts are causing this but I am not 100% sure.

Something weird: this check should be skipped because it is labeled “No Changelog Needed”. I edited the PR description to make sure that the PR was labeled prior to re-running the changelog check and it’s still failing with the above message.

/cc @cmarmo

Issue Analytics

  • State:closed
  • Created 3 years ago
  • Comments:5 (5 by maintainers)

github_iconTop GitHub Comments

1reaction
ogriselcommented, Feb 25, 2021

After merging main into the PR branch, the problem disappeared: the check-changelog check is now skipped in #19540

1reaction
cmarmocommented, Feb 25, 2021

The typo fixed by f2943c6d10f68dd2144a80ad4b12475a25ff635a is back… 😦 sorry

Read more comments on GitHub >

github_iconTop Results From Across the Web

Current master has unresolved merge conflicts. #697 - GitHub
The changes appear to be from a merge of one of your other pr's that wasn't properly tested prior to commit of the...
Read more >
Merge conflicts - GitLab Docs
GitLab resolves conflicts by creating a merge commit in the source branch, but does not merge it into the target branch. You can...
Read more >
How to resolve git stash conflict without commit?
Suppose you have this scenario where you stash your changes in order to pull from origin. Possibly because your local changes ...
Read more >
How to resolve a git merge conflict - Opensource.com
Then it says fix conflicts and then commit the result, so if you follow directions, edit the file, then commit it, everything should...
Read more >
How to Fix Git Error: You need to resolve your current index first
Solution 1: Resolving the Merge Conflict · Resolve all the conflicts. Check the files which have conflicts as they will be marked by...
Read more >

github_iconTop Related Medium Post

No results found

github_iconTop Related StackOverflow Question

No results found

github_iconTroubleshoot Live Code

Lightrun enables developers to add logs, metrics and snapshots to live code - no restarts or redeploys required.
Start Free

github_iconTop Related Reddit Thread

No results found

github_iconTop Related Hackernoon Post

No results found

github_iconTop Related Tweet

No results found

github_iconTop Related Dev.to Post

No results found

github_iconTop Related Hashnode Post

No results found