Skip to content
Snippets Groups Projects
Select Git revision
  • master
  • artifact
2 results

eic_simulations

  • Clone with SSH
  • Clone with HTTPS
  • Alexandria Weary's avatar
    Alexandria Weary authored and Whitney Armstrong committed
    0c8abec9
    History
    Name Last commit Last update
    .gitlab-ci.yml
    README.md

    Summer 2021 remote project

    Alexandria Weary

    Tasks

    Learning git

    • Create a eicweb account
    • Review basic markdown syntax.
    • Create an issue and a draft MR.
    • Let Whit know so he can create a merge conflict.
    • Resolve merge conflict via rebase.
    • Add Continuous integration to this repository via .gitlab-ci.yml which just runs a bash script.
    • In the CI, create an html file artifact for this readme using pandoc. (Hint: pandoc -s -f markdown -t html5 -o output.html input.md -c style.css

    Simulation

    • Discuss ideas for a color scheme and strategy for athena.
    • Construct plan by creating a new milestone.
    • Add steps or tasks to the milestone by creating new issues, make sure to associate the issue with the milestone.
    • Make 2 sets of visualization attributes:
      • simplified (fast)
      • detailed (slow)

    "Merge" Conflicts

    • You can merge. (not preferred these days)
    • You can rebase. (do this and understand what happens).

    Markdown Practice

    Lists

    • these are bullet points
    • I can indent them
    1. I can format examples at a lower rank than the indent

    Inserts

    this is a link to the google homepage

    alt text this is a picture of a flower.

    Code

    this paragraph has some variable inline code

    • I used the backtick key
    <p>A paragraph example</p>
    let num = Math.random();
    
    ### Formatting
    this is a block quote
    > wow, look at this block quote
    
    I can make a table as well
    
    | 1 | 2 | 3|
    | --- | ---| --- |
    | data a1 | data a2 | data a3 |
    | data b1 | data b2 | data b3 |
    
    ### Modifying text
    
    **bolded text**
    * italicised text*
    --strikethrough text--
    
    git checkout my-feature-branch
    git checkout -b my-feature-branch-backup
    git checkout my-feature-branch
    git checkout my-feature-branch
    git reset --hard my-feature-branch-backup
    git fetch origin main
    git checkout my-feature-branch
    git rebase origin/main
    git push --force origin my-feature-branch