Skip to content

fix merge conflict for lean#8883 #65

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: lean-pr-testing-8883
Choose a base branch
from
Open

fix merge conflict for lean#8883 #65

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions Mathlib/CategoryTheory/Limits/VanKampen.lean
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -686,9 +686,10 @@ theorem isVanKampenColimit_extendCofan {n : ℕ} (f : Fin (n + 1) → C)
· simp only [Fin.cases_zero, m₁]
· simp only [← m₂, colimit.ι_desc_assoc, Discrete.functor_obj,
Cofan.mk_pt, Cofan.mk_ι_app, Fin.cases_succ]
induction' j using Fin.inductionOn with j _
· exact t₂' ⟨WalkingPair.left⟩
· have t₁' := (t₁ (Cofan.mk _ (Sigma.ι fun (j : Fin n) ↦ F.obj ⟨j.succ⟩)) (Discrete.natTrans
induction j using Fin.inductionOn with
| zero => exact t₂' ⟨WalkingPair.left⟩
| succ j _ =>
have t₁' := (t₁ (Cofan.mk _ (Sigma.ι fun (j : Fin n) ↦ F.obj ⟨j.succ⟩)) (Discrete.natTrans
fun i ↦ α.app _) (Sigma.desc (fun j ↦ α.app _ ≫ c₁.inj _)) ?_
(NatTrans.equifibered_of_discrete _)).mp ⟨coproductIsCoproduct _⟩ ⟨j⟩
rotate_left
Expand Down