git:git_resources
Differences
This shows you the differences between two versions of the page.
Both sides previous revisionPrevious revisionNext revision | Previous revision | ||
git:git_resources [2015/08/09 12:27] – igorkagan | git:git_resources [2022/12/29 07:15] (current) – external edit 127.0.0.1 | ||
---|---|---|---|
Line 4: | Line 4: | ||
DAG code repository: | DAG code repository: | ||
- | Really easy GUI client: https://windows.github.com/ | + | Test repositories to try things out LOL: |
+ | https://github.com/ | ||
+ | https://github.com/dagdpz/ | ||
- | Quite intuitive and more powerful client: http:// | + | {{:restricted_commits_master_branch_settings.png?800|}} |
- | ==== Help ==== | + | Really easy GUI client for Win or Mac: https:// |
+ | |||
+ | for **the even more simple and intuitive previous version of GitHub**, use Y: | ||
+ | |||
+ | Intuitive and more powerful client, Win, Linux, Mac: http:// | ||
+ | |||
+ | <WRAP center round important 60%> | ||
+ | To add repositories to MATLAB path, **excluding** .git, add the following in startup.m | ||
+ | </ | ||
+ | |||
+ | <code=" | ||
+ | |||
+ | ==== Basic ideas: ==== | ||
+ | |||
+ | 1. Create 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) | ||
+ | |||
+ | (OR) | ||
+ | |||
+ | __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!** | ||
+ | < | ||
+ | <<<<<<< | ||
+ | % concurrent edit from IKDAG (after the file was already edited and committed from igor.broadmonk) | ||
+ | ======= | ||
+ | % concurrent edit from igor.broadmonk | ||
+ | >>>>>>> | ||
+ | </ | ||
+ | |||
+ | 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 | ||
+ | |||
+ | |||
+ | |||
+ | |||
+ | ==== More detailed help ==== | ||
http:// | http:// |
git/git_resources.1439123242.txt.gz · Last modified: 2022/12/29 07:15 (external edit)