CS3343 Software Engineering Practice Project - Group18

Java testing program

https://drive.google.com/drive/folders/0B2znpjlXrr9jV3VGT0RqYUZTYlE

Git Practice Guide

• 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.

Important

Choose Ancestor Order in SourceTree to show the correct order of history

Tools

SourceTree - the gui git management program

https://www.sourcetreeapp.com
You may need to create an Atlassian account while installing SourceTree

Setup (After installation)

Clone the repository

Create your feature branch

2. Enter your feature branch name and select from a specified commit

3. Choose develop (Mean create your feature branch which is copied from develop)

Import the project into eclipse

1. Choose the root folder "SEP_Project_Group18" as the Workspace

2. Click "File">"Import..."

3. Choose "General">"Existing Projects into Workspace

4. Choose the folder "cs3343.group18.usermanagementsystem"

5. Done

Please keep your feature branch up-to-date with develop

1. Commit all changes on your feature branch and Push
2. Switch to develop, then click Pull
3. Switch back to your feature branch
4. Click Merge, choose the history which is on origin/develop origin/HEAD develop
5. If you see the file conflict, you can try to fix it
6. If you cannot solve conflict, you can give up this merging by following command

(Click Terminal and enter):
    git merge --abort

Pull request (Merge your finished feature branch into develop)

1. After finishing your feature branch, your want to merge into develop. Goto github you will see this and click "Compare & pull request"

2. Add your command for pull request if necessary and choose the reviewers to help you approve your changes

3. In the pull request, you can see all the files changes and "Review changes" for reviewers

WinMerge (Code different compare and view)

http://winmerge.org

2. Setup WinMerge in SourceTree

Visual Studio Code (More powerfull than notepad++)

https://code.visualstudio.com