barthflo

flo@kubuntu:~/Documents/Wild Code School/quests/Git/my-website-oops$ git log --oneline
5d2a82d (HEAD -> master) added some content
94ccae9 modified title
7e4878a created index.html
flo@kubuntu:~/Documents/Wild Code School/quests/Git/my-website-oops$ git revert HEAD
[master 3d41213] Revert "added some content"
 1 file changed, 11 insertions(+), 13 deletions(-)
 rewrite index.html (71%)
flo@kubuntu:~/Documents/Wild Code School/quests/Git/my-website-oops$ git log --oneline
3d41213 (HEAD -> master) Revert "added some content"

barthflo

flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git pull
Auto-merging README.md
CONFLICT (content): Merge conflict in README.md
Automatic merge failed; fix conflicts and then commit the result.
flo@kubuntu:~/Documents/Wild Code School/quests/Git/merge-conflicts$ git status
On branch master
Your branch and 'origin/master' have diverged,
and have 1 and 1 different commits each, respectively.
  (use "git pull" to merge the remote branch into yours)

barthflo

// Find Command

flo@kubuntu:~/Documents/Wild Code School/quests/shell$ find planets
planets
planets/fictionnal
planets/fictionnal/coruscant.jpeg
planets/fictionnal/cybertron.jpeg
planets/fictionnal/arrakis.jpeg
planets/inhabited
planets/inhabited/coruscant.jpeg

barthflo

 dpkg-mergechangelogs                 lesskey                            ps2pdf12                          who
 dpkg-name                            lesspipe                           ps2pdf13                          whoami
 dpkg-parsechangelog                  lexgrog                            ps2pdf14                          whois
 dpkg-query                           libnetcfg                          ps2pdfwr                          whoopsie
 dpkg-scanpackages                    libreoffice                        ps2ps                             whoopsie-preferences
 dpkg-scansources                     libwacom-list-local-devices        ps2ps2                            word-list-compress
 dpkg-shlibdeps                       linguist                           ps2txt                            wordview
 dpkg-source                          link                               psfaddtable                       wpa_passphrase
 dpkg-split                           linkicc                            psfge

barthflo

start maxBuy (real money, real price)

  int maxBuy ← 0
  
  IF money AND price > 0
    As long as money >= price
        money ← money - price
        maxBuy ← maxBuy+1
    End As long as
  End IF