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 [2017/05/16 19:10] – 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: | ||
- | Test repository | + | Test repositories |
+ | https:// | ||
+ | https:// | ||
+ | |||
+ | {{: | ||
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: | ||
Intuitive and more powerful client, Win, Linux, Mac: http:// | 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 | ||
+ | </ | ||
+ | |||
+ | < | ||
==== 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) | 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) | + | __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) | + | (OR) |
- | 2.2 When editing concurrently and doing the same as in 2.1: | + | __GitEye__: pull, change code, commit and push (now you should see changes online) |
- | Sync conflict! | + | 2.2 When editing concurrently (by >1 person) and doing the same as in 2.1: |
- | <pre> | + | |
+ | **Sync conflict!** | ||
+ | <code> | ||
<<<<<<< | <<<<<<< | ||
% concurrent edit from IKDAG (after the file was already edited and committed from igor.broadmonk) | % concurrent edit from IKDAG (after the file was already edited and committed from igor.broadmonk) | ||
Line 31: | Line 48: | ||
% concurrent edit from igor.broadmonk | % concurrent edit from igor.broadmonk | ||
>>>>>>> | >>>>>>> | ||
- | </pre> | + | </code> |
+ | |||
+ | 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 | ||
- | Resolve conflicts! | ||
- | commit and push/sync again | ||
git/git_resources.1494961828.txt.gz · Last modified: 2022/12/29 07:15 (external edit)