Differences

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

--- git:git_resources [2017/05/16 18:05] – igorkagan
+++ git:git_resources [2022/12/29 07:15] (current) – external edit 127.0.0.1
@@ Line 4: / Line 4: @@
 DAG code repository:  https://github.com/dagdpz
-Test repository to try things out: https://github.com/dagdpz/test LOL
+Test repositories to try things out LOL:
+https://github.com/dagdpz/test
+https://github.com/dagdpz/test_restricted_commits
+{{:restricted_commits_master_branch_settings.png?800|}}
 Really easy GUI client for Win or Mac: https://windows.github.com/
+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://www.collab.net/downloads/giteye
+<WRAP center round important 60%>
+To add repositories to MATLAB path, **excluding** .git, add the following in startup.m
+</WRAP>
+<code="matlab">addpath(genpath_exclude('...Repos','.git')); % genpath_exclude function in Igtools/external </code>
+==== Basic ideas: ====
+. Create repository:
+New >
+. For an existing repository:
+.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)
+(OR)
+__GitEye__: pull, change code, commit and push (now you should see changes online)
+.2 When editing concurrently (by >1 person) and doing the same as in 2.1:
+**Sync conflict!**
+<code>
+<<<<<<< HEAD
+% concurrent edit from IKDAG (after the file was already edited and committed from igor.broadmonk)
+=======
+% concurrent edit from igor.broadmonk
+>>>>>>> origin/master
+</code>
+Resolve conflicts, then commit and push/sync again
+.3 Working with branches
+.3.1 Create new branch
+.3.2 Do same as 2.1
+.3.3 Pull Request > New pull request > Create Pull Request > Merge pull request