Code

Add merge-conflict notifications#1856

Code

Merged

ehuss merged 5 commits intorust-lang:masterrust-lang/triagebot:masterfrom ehuss:merge-conflictehuss/triagebot:merge-conflictCopy head branch name to clipboardNov 23, 2024

+456-1

Commits

Commits on Nov 8, 2024

• Add merge-conflict notifications

  ehuss

  committed
  1f1710c

Commits on Nov 23, 2024

• Use Duration::from_secs

  Show description for b378456
  

  ehuss

  and

  Mark-Simulacrum

  authored
  b378456

• Resolve comment about database locking

  Show description for cc3c50b
  ehuss

  committed
  cc3c50b

• Clone the existing GitHub client instead of creating a new one

  Show description for e4d1bc2
  ehuss

  committed
  e4d1bc2

• Pluralize merge-conflicts

  Show description for 5301321
  ehuss

  committed
  5301321