From 365cec3d5377e618199acfdf7f26545238aacdca Mon Sep 17 00:00:00 2001 From: mePy2 Date: Mon, 29 Mar 2021 16:13:27 +0100 Subject: [PATCH] placeholders --- HDL_workflow/git_checklist.mdwn | 20 ++++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/HDL_workflow/git_checklist.mdwn b/HDL_workflow/git_checklist.mdwn index 103330fcc..b1260178f 100644 --- a/HDL_workflow/git_checklist.mdwn +++ b/HDL_workflow/git_checklist.mdwn @@ -23,10 +23,26 @@ smaller. If unsure, ask on the mailing list."""]] * run `git pull` * run `git push` -# what to do if "git pull" results in conflict +# Troubleshooting +## [[!toggle id="conflict" text="""what to do if "git pull" results in conflict"""]] -# what to do if you want to add files. +[[!toggleable id="conflict" text=""" +* to be done +* if you are still unsure what to do please ask for advice on IRC or the +mailing list +[[!toggle id="conflict" text="hide"]] +"""]] + +## [[!toggle id="add" text="""what to do if you want to add files."""]] + +[[!toggleable id="add" text=""" +* to be done +* if you are still unsure what to do please ask for advice on IRC or the +mailing list + +[[!toggle id="add" text="hide"]] +"""]] --- this one, `git status` is very important, to check files that should have -- 2.30.2