Gao, Linda
checkout the commands with the Basic Command
git checkout develop (switch to develop branch)
git pull (if there is new changes)
git branch feature-[name] (create a new branch,[name] means optional parameter)
you can try to merge to the develop branch by these commands:
git checkout develop
git pull
git merge feature/[name] (merge the feature/[name] branch to develop)
git push -u origin develop (push the merged code to develop)
git push origin --delete feature/[name] (delete the remote one)
git branch -d feature/[name] (delete the local feature/[name] branch )
and follow the same steps like you do on feature
git clone https://github.com/likeconan/Thailand.git
npm install
npm start
/client
/build -- build by webpack and should not be uploaded
/config -- used in different environment
/src
/actions -- actions for redux
user.action.js -- export function to execute in frontend
/components-dumb -- dumb components in react without redux
/Styles -- styles for components
user-login.less
UserLogin.js
/components-page -- page components in react
/components-smart -- smart components in react with redux
/reducers -- redux reducers
/utilities -- common functions
app.client.js -- react root
store.js -- redux store
webpack.config.js
server.js
/server
/controllers -- all dal functions created in here
base.controller.js -- implemented
user.controller.js
/lib -- set config and inital for routes
/models -- models