https://drive.google.com/drive/folders/0B2znpjlXrr9jV3VGT0RqYUZTYlE
- To do a development, should create a feature branch from develop. E.g. feature/abc
- The develop and master branch are protected. You could not commit/push into them directly.
- When you want to merge you feature branch into develop, you should create a pull request on GitHub and assign a reviewer to approve merging.
- Your should pull(merge) develop into your feature branch that make your feature branch up-to-date.
- Do not pull(merge) master into your feature branch because it is older than develop branch. Imagine that master branch is a production version (It should only contain the statble code).
- You could google git flow development practice.
https://www.sourcetreeapp.com
You may need to create an Atlassian account while installing SourceTree
- Enter your feature branch name and select from a specified commit
- Choose develop (Mean create your feature branch which is copied from develop)
- Choose the root folder "SEP_Project_Group18" as the Workspace
- Click "File">"Import..."
- Choose "General">"Existing Projects into Workspace
- Choose the folder "cs3343.group18.usermanagementsystem"
- Done
- Commit all changes on your feature branch and Push
- Switch to develop, then click Pull
- Switch back to your feature branch
- Click Merge, choose the history which is on origin/develop origin/HEAD develop
- If you see the file conflict, you can try to fix it
- If you cannot solve conflict, you can give up this merging by following command
(Click Terminal and enter):
git merge --abort
- After finishing your feature branch, your want to merge into develop. Goto github you will see this and click "Compare & pull request"
- Add your command for pull request if necessary and choose the reviewers to help you approve your changes
- In the pull request, you can see all the files changes and "Review changes" for reviewers
- Setup WinMerge in SourceTree