hw_sw_interface's Introduction
See https://class.coursera.org/hwswinterface-001/forum/thread?thread_id=149 for a brief discussion about conflicts and updates. More info below. A conflict is when the course-materials update includes a change to a file that has already been changed locally (by you). It's sometimes hard to merge the changes properly so, after the update-course script tries its best, it will also place two files in the same directory as the file with the conflict. There will be both a *.bak and *.pristine file (where the * indicates the filename for the conflict). The .bak file will contain the contents of your file before the update and the .pristine file will contain a "clean" copy of the file. In other words, the .pristine file will be what a student that didn't have a conflict would see. It's important to review each conflict to ensure that the merge did the "right thing" and that your assignment is still correct. If it isn't, then you will most likely have to manually merge the .bak and .pristine changes yourself. There are "merge tools" that you may want to research. They are available to help automate the merging process. As a note, we will try our utmost to never change a submission template, but we fully reserve the right to change any of the provided code that you were not asked to modify. This also includes the right to change the tools that we provide. In order to not have any conflicts, it's recommended to never change any file other than those for submission purposes.
hw_sw_interface's People
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.