User Tools

Site Tools


project:git_basics

Differences

This shows you the differences between two versions of the page.

Link to this comparison view

Both sides previous revision Previous revision
Last revision Both sides next revision
project:git_basics [2017/07/18 16:47]
dp
project:git_basics [2017/07/18 17:01]
dp
Line 85: Line 85:
 ''​git add *.txt''​ ''​git add *.txt''​
  
 +''​git branch IME_NOVOG_BRANCHA''​ create new branch
 +
 +''​git checkout IME_NOVOG_BRANCHA'' ​
 +
 +''​git checkout master''​ switch back to the main branch ​
 +
 +''​git merge IME_NOVOG_BRANCHA''​ ... ali i potencijalni konflikti...
  
 ===== Primjer grupnog rada ===== ===== Primjer grupnog rada =====
project/git_basics.txt · Last modified: 2017/07/19 15:54 by dp