User:Markvandenheuvel/prototyping: Difference between revisions

From XPUB & Lens-Based wiki
No edit summary
Line 94: Line 94:
Before you go back to working on projects, where you are not the only collaborators.
Before you go back to working on projects, where you are not the only collaborators.


'''How do I deal with conflicts?'''
'''How do I deal with conflicts?''' <br>  
<br> Merge conflicts can happen when you are about to push your commit, however git is not able to merge you commit into the remote, probably because another collaborator was also working on the same fil.
Merge conflicts can happen when you are about to push your commit, however git is not able to merge you commit into the remote, probably because another collaborator was also working on the same fil.
<br>
 


=Prototyping Session 01 (with Michael Murtaugh)=
=Prototyping Session 01 (with Michael Murtaugh)=
date: 02-10-2019 <br>
date: 02-10-2019 <br>
pad: https://pad.xpub.nl/p/prototypingm01
pad: https://pad.xpub.nl/p/prototypingm01

Revision as of 14:34, 4 October 2019

Prototyping Session 01 (with Andre Castro)

date: 16-09-2019
pad: https://pad.xpub.nl/p/prototyping-20190916

UNIX

UNIX is a family of multitasking, multiuser computer operating systems that derive from the original AT&T Unix, development starting in the 1970s at the Bell Labs research center. The OS made it possible for a lot of users to interact with a single machine at the same time. Before, this was done by a batch process via an operator/administrator.

Rasperry Pi

Raspberry Pi is a small single board computer used for learning basic computer science.

Rasperry Pi
  • Basic tasks & experiments:
  • Logging into the Raspberry Pi
  • printing with Matrix printer, ascii word-art generator (more), text-to-speech
  • creating public_html directory and index.html on the Sandbox (note: remote login not possible)
  • modifying texts (bio) through Terminal using Dadadodo and SED (changing and replacing certain characters)
  • working with Unix HTML - editor: ne nice editor
  • chaining programs a.k.a PIPING (command: |) / concatonate files (command: CAT)


IP adres of the Pi:

145.24.139.127

Copying files from personal machine to Sandbox:

scp file.txt username@145.24.139.127:/home/username

other useful & interesting links


Prototyping Session 02 (with Andre Castro)

date: 30-09-2019
pad: https://pad.xpub.nl/p/prototyping-20190930

Basic tasks & experiments:

  • Creating and cofigured personal Keys (passphrase) for R-Pi
  • Introduction to GIT: tracking and collaborating
  • Configuring GIT and working with repositories


Basic GIT Workflow:

  • Clone to your computer the folder from GIT (with the ssh url)
  • Then you can pull changes from the GIT 

  • Or push changes back to the GIT

How to work with GIT & repositories in UNIX

How to initiate a git repository?

git init

How do I create a (version) commit of my project?

git status
git add (f.e: index.html style.css)
git commit -m "first 2 files of website"
git log

What did change since my last commit?

git diff 
git diff style.css

How do i remove the changes of a file before it gets commited?

git checkout -- style.css
git restore style.css

How do i see what my project looked like in a cetain commit, and how do I go back to where I was (HEAD)? How do I go back in history my changes?

git revert

How do I create a remote and push my changes to that remote?

https://hub.xpub.nl/sandbox~markvandenheuvel

Git with others

Specials issues website


How do I clone a repository from git.xpub.nl?

git clone (link)

Make your changes and commit

git commit -m 'added new quote'
git commit -a -m 'edited links'

How publish my commit back to the "remote"?

git push 

How do I avoid conflicts?

git pull origin master

Before you go back to working on projects, where you are not the only collaborators.

How do I deal with conflicts?
Merge conflicts can happen when you are about to push your commit, however git is not able to merge you commit into the remote, probably because another collaborator was also working on the same fil.


Prototyping Session 01 (with Michael Murtaugh)

date: 02-10-2019
pad: https://pad.xpub.nl/p/prototypingm01