User Tools

Site Tools



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

Link to this comparison view

Both sides previous revision Previous revision
Next revision
Previous revision
git:git_resources [2017/05/16 18:24]
git:git_resources [2019/02/28 09:39] (current)
Line 4: Line 4:
 DAG code repository: ​ https://​​dagdpz DAG code repository: ​ https://​​dagdpz
-Test repository ​to try things out: https://​​dagdpz/​test ​LOL+Test repositories ​to try things out LOL 
 +https://​​dagdpz/​test ​ 
 Really easy GUI client for Win or Mac: https://​​ Really easy GUI client for Win or Mac: https://​​
 +for **the even more simple and intuitive previous version of GitHub**, use Y:​\Software\GitHub\GitHubSetup.exe
 Intuitive and more powerful client, Win, Linux, Mac: http://​​downloads/​giteye Intuitive and more powerful client, Win, Linux, Mac: http://​​downloads/​giteye
 +<WRAP center round important 60%>
 +To add repositories to MATLAB path, **excluding** .git, add the following in startup.m
 +<​code="​matlab">​addpath(genpath_exclude('​...Repos','​.git'​));​ % genpath_exclude function in Igtools/​external </​code>​
 ==== Basic ideas: ==== ==== Basic ideas: ====
Line 14: Line 27:
 1. Create repository: ​ 1. Create repository: ​
-2. For existing repository:+New >  
 +2. For an existing repository: 
 +2.1 When you are working on your own or sequentially (i.e. no concurrent edits) 
 +__GitHub__: sync, change code, commit and sync (now you should see changes online) 
 +__GitEye__: pull, change code, commit and push (now you should see changes online) 
 +2.2 When editing concurrently (by >1 person) and doing the same as in 2.1: 
 +**Sync conflict!** 
 +<<<<<<<​ HEAD 
 +% concurrent edit from IKDAG (after the file was already edited and committed from igor.broadmonk) 
 +% concurrent edit from igor.broadmonk 
 +>>>>>>>​ origin/​master 
 +Resolve conflicts, then commit and push/sync again 
 +2.3 Working with branches 
 +2.3.1 Create new branch 
 +2.3.2 Do same as 2.1
 +2.3.3 Pull Request > New pull request > Create Pull Request > Merge pull request
git/git_resources.1494959041.txt.gz · Last modified: 2017/05/16 18:24 by igorkagan