Loading...
 

1806 Python D4


Course notes

Numpy Matplotlib et al

Personal tests

Plotly in python
https://plot.ly/python/ipython-notebook-tutorial/

Twitter app

Fet al notebook the Day3

Resolve git conflicts

Awesome tool!: git mergetool

convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git add .
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git commit -a -m "My files from day 3, all course notes in PDF from Alex Website and from Atenea as of yesterday"
[master 54af31c] My files from day 3, all course notes in PDF from Alex Website and from Atenea as of yesterday
 83 files changed, 22667 insertions(+), 2 deletions(-)
 create mode 100755 .ipynb_checkpoints/Day 3-checkpoint.ipynb
 create mode 100755 .ipynb_checkpoints/plotly_testing-checkpoint.ipynb
 delete mode 120000 200C104_Atenea_Moodle
 create mode 100644 200C104_Atenea_Moodle/200C104-PYTHON.html
(...)
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git push
Username for 'https://gitlab.com': xavidp
Password for 'https://xavidp@gitlab.com': 
To https://gitlab.com/xavidp/1806_Python_for_Data_Analysis.git
 ! [rejected]        master -> master (fetch first)
error: failed to push some refs to 'https://gitlab.com/xavidp/1806_Python_for_Data_Analysis.git'
hint: Updates were rejected because the remote contains work that you do
hint: not have locally. This is usually caused by another repository pushing
hint: to the same ref. You may want to first integrate the remote changes
hint: (e.g., 'git pull ...') before pushing again.
hint: See the 'Note about fast-forwards' in 'git push --help' for details.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git pull
remote: Counting objects: 8, done.
remote: Compressing objects: 100% (8/8), done.
remote: Total 8 (delta 4), reused 0 (delta 0)
Unpacking objects: 100% (8/8), done.
From https://gitlab.com/xavidp/1806_Python_for_Data_Analysis
   d080f9e..7d5dd72  master     -> origin/master
Removing R_Telegram_Bot/.gitignore
CONFLICT (modify/delete): R_Telegram_Bot/.Renviron deleted in 7d5dd72d84d4f10711c75acf267caf499056674f and modified in HEAD. Version HEAD of R_Telegram_Bot/.Renviron left in tree.
Adding 200C104_Atenea_Moodle/Adjunts/telepot_12_7_documentation_files/underscore.js
(...)
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git merge
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git merge --strategy-option ours
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git checkout --theirs .
error: path 'R_Telegram_Bot/.Renviron' does not have their version
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git checkout --ours .  
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git merge --strategy-option ours
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git merge --strategy-option ours  
error: Merging is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git pull
error: Pulling is not possible because you have unmerged files.
hint: Fix them up in the work tree, and then use 'git add/rm <file>'
hint: as appropriate to mark resolution and make a commit.
fatal: Exiting because of an unresolved conflict.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git mergetool

This message is displayed because 'merge.tool' is not configured.
See 'git mergetool --tool-help' or 'git help config' for more details.
'git mergetool' will now attempt to use one of the following tools:
opendiff kdiff3 tkdiff xxdiff meld tortoisemerge gvimdiff diffuse diffmerge ecmerge p4merge araxis bc codecompare emerge vimdiff
Merging:
R_Telegram_Bot/.Renviron

Deleted merge conflict for 'R_Telegram_Bot/.Renviron':
  {local}: modified file
  {remote}: deleted
Use (m)odified or (d)eleted file, or (a)bort? m
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git pull
error: You have not concluded your merge (MERGE_HEAD exists).
hint: Please, commit your changes before merging.
fatal: Exiting because of unfinished merge.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git commit -a -m "My files from day 3, all course notes in PDF from Alex Website and from Atenea as of yesterday. REsolved conflict in .Renviron"
[master 32ff69c] My files from day 3, all course notes in PDF from Alex Website and from Atenea as of yesterday. REsolved conflict in .Renviron
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git pull
Already up-to-date.
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$ git push
Username for 'https://gitlab.com': xavidp
Password for 'https://xavidp@gitlab.com': 
Counting objects: 38, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (36/36), done.
Writing objects: 100% (38/38), 9.57 MiB | 3.58 MiB/s, done.
Total 38 (delta 9), reused 0 (delta 0)
To https://gitlab.com/xavidp/1806_Python_for_Data_Analysis.git
   7d5dd72..32ff69c  master -> master
convidat.fme@fme-desktop:~/KOLMOGOROV/Xavier_OMD/1806_Python_for_Data_Analysis$
Image Seed: noun \ˈsēd\ : the beginning of something which continues to develop or grow

Knowledge seeds

Switch Language