This repo is a test to see how we can handle git sync with DSS.
- Create a repo on github
- Add the README.md from DSS
- Sync from DSS to github
- Import the lib (from sync by plugin) into PyCharm
- Modify the README.md (Can't sync with git, as the library folder does not contain
.gitdirectory.) - Sync with DSS.
- From DSS: Modify the README and Push to github.
- Modify the README.md (in DSS, while branch has been create from github, and the file hase been modified from Pycharm)
- Commit and push from DSS
- New modification from DSS, and then try to push.
- There is no synchronization between PyCharm and DSS. So every modification done in POycharm has been lost.
- Third modification from Pycharm, then sync with DSS. After sync reload the file from DSS before doing modification.
- If we reload the file before doing any modification, the file is updated, and then we can do modification.
- Create a branch from GitHub.
- Modify the README (from github), and commit
- Some modifcations to the github branch (from github)
- Try to merge branch from github
- Some conflicts (expected) to resolve.
- Modification from DSS while the branch has been merged
- While pushing the conflict has been detected, and then resolve the conflict inside DSS, and mark as resolved, and push.
- From Pycharm, clone the repo.
- From DSS, reload page. The ne directory appears, but it is not linked to Github.
- Update the reference, with the appropraite informations.
- Modify the README, and push from DSS
- The referecne from the git repo has been lost... SO in the same situation than before.