misc's Issues
er diagram
swpp 2018 git quiz
SWPP2018 Git Quiz
There are two branches, master branch and add branch, on this repository. The master branch contains a skeleton code for a calculator (the same one as the assignment), and the add branch contains the skeleton code and the implementation of add function. You will make two pull requests, one for the master branch and one for the add branch.
STEP 1
Fork this repository and clone the fork into your local machine.
Make a new branch calc1 from the master branch and checkout to it.
Implement add, sub, and mul function, while making one commit for each function. This means, you should make three commits in total.
Push your branch into origin repository and make a pull request to the master branch of the upstream repository(this repository) from your calc1 branch.
STEP2
Checkout to a new branch calc2 from the calc1 branch.
Squash the three commits you have made and push it into the calc2 branch of your fork.
Since add function is already implemented in the add branch, there will be a conflict between the add branch and calc2 branch.
Resolve the conflict and make a pull request to the add branch of the upstream repository from your calc2 branch.
NOTE
Note that the two pull requests should not contain any conflicts after you finish all the steps.
axios
Recommend Projects
-
React
A declarative, efficient, and flexible JavaScript library for building user interfaces.
-
Vue.js
๐ Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
-
Typescript
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
-
TensorFlow
An Open Source Machine Learning Framework for Everyone
-
Django
The Web framework for perfectionists with deadlines.
-
Laravel
A PHP framework for web artisans
-
D3
Bring data to life with SVG, Canvas and HTML. ๐๐๐
-
Recommend Topics
-
javascript
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
-
web
Some thing interesting about web. New door for the world.
-
server
A server is a program made to process requests and deliver data to clients.
-
Machine learning
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
-
Visualization
Some thing interesting about visualization, use data art
-
Game
Some thing interesting about game, make everyone happy.
Recommend Org
-
Facebook
We are working to build community through open source technology. NB: members must have two-factor auth.
-
Microsoft
Open source projects and samples from Microsoft.
-
Google
Google โค๏ธ Open Source for everyone.
-
Alibaba
Alibaba Open Source for everyone
-
D3
Data-Driven Documents codes.
-
Tencent
China tencent open source team.