scrum-1 / cd2019 Goto Github PK
View Code? Open in Web Editor NEW用來測試 ssh 模式下協同產品設計實習流程
License: GNU Affero General Public License v3.0
用來測試 ssh 模式下協同產品設計實習流程
License: GNU Affero General Public License v3.0
所有組員均必須參與零組件繪圖, 可以多人同時針對某一特定零件繪圖, 也可經過討論後, 分配各組員執行特定零組件繪圖.
所有組員均必須針對討論內容發表意見
搜尋過程, 以"python replace different string simultaneously" 作為關鍵字, 參考 https://stackoverflow.com/questions/6116978/how-to-replace-multiple-substrings-of-a-string/6117042 中所提供的方法, 可以同時將 config/content.htm 中的 h 各往後推送一階.
import re
rep = {"h1": "h2", "h2": "h3", "h3": "h4"} # define desired replacements here
# use these three lines to do the replacement
rep = dict((re.escape(k), v) for k, v in rep.items())
pattern = re.compile("|".join(rep.keys()))
#text = pattern.sub(lambda m: rep[re.escape(m.group(0))], text)
result = pattern.sub(lambda m: rep[re.escape(m.group(0))], "<h1>test1</h1>test1<h2>test2</h2>test2<h3>test3</h3>test3")
print(result)
具有版次的雲端電腦輔助機械協同設計與產品的動態功能模擬, 是本課程所強調的重點, 希望各位學員能夠在協同產品設計實習課程中了解, 產品開發過程中若每一位成員都能具備掌握各工具的開發主導權, 將可讓每一項協同設計任務更具彈性, 無論是 2D/3D 零組件設計繪圖, 或隨後的動態模擬系統都值得各位爾後更進一步深入了解.
本課程將根據各位所提供的 Github 倉儲歷程、自評與互評, 以及期末協同考試過程中的表現進行評分.
祝大家暑假愉快!
若各組員在後續建立 V-rep 過程需要編修零件, 希望建立分支後進行繪圖修改, 之後若與其他組員討論後可與 Main 版本零件進行合併後釋出.
各零件之 vrep 版本主要外型較為簡單, 用來轉入 V-rep 後較容易進行簡化, 而 Main 版本則為較接近最後實體的零組件, 可以輸入 V-rep 後依附在簡化後的零件之上進行動態模擬.
基本概念為, 以 pull request 所要合併的舊資料主體 (這裡為 master) 為基準, 建立一個暫時分支, 然後以 git pull 從 pull request 的新版本倉儲, 拉下資料版本, 這時 git 會檢查兩個版本的差異, 並判定能否自動合併.
若前述兩個分支內容無法自動合併, 則必須手動合併 (在 CMSimfly 動態模式下編輯後轉為靜態內容, 或以各自的 學號_reveal.leo 或 學號_pelican.leo 處理可能的衝突, 完成後, 設法將暫時分支與 master 分支合併後, 進行 master 的改版.
Step 1: From your project repository, check out a new branch and test the changes.
根據 master 內容, 建立一個 scrum-2-master branch
git checkout -b scrum-2-master master
拉回 pull request 的來源
git pull https://github.com/scrum-2/pr1.git master
處理合併後以 git add . 認所有的變更
Step 2: Merge the changes and update on GitHub.
遷出 master 分支
git checkout master
執行暫存分之 scrum-2-master 與 master 的合併
The --no-ff flag prevents git merge from executing a "fast-forward" if it detects that your current HEAD is an ancestor of the commit you're trying to merge. A fast-forward is when, instead of constructing a merge commit, git just moves your branch pointer to point at the incoming commit.
git merge --no-ff scrum-2-master
git commit - m "solved scrum-2-master pull request"
git push origin master
A declarative, efficient, and flexible JavaScript library for building user interfaces.
🖖 Vue.js is a progressive, incrementally-adoptable JavaScript framework for building UI on the web.
TypeScript is a superset of JavaScript that compiles to clean JavaScript output.
An Open Source Machine Learning Framework for Everyone
The Web framework for perfectionists with deadlines.
A PHP framework for web artisans
Bring data to life with SVG, Canvas and HTML. 📊📈🎉
JavaScript (JS) is a lightweight interpreted programming language with first-class functions.
Some thing interesting about web. New door for the world.
A server is a program made to process requests and deliver data to clients.
Machine learning is a way of modeling and interpreting data that allows a piece of software to respond intelligently.
Some thing interesting about visualization, use data art
Some thing interesting about game, make everyone happy.
We are working to build community through open source technology. NB: members must have two-factor auth.
Open source projects and samples from Microsoft.
Google ❤️ Open Source for everyone.
Alibaba Open Source for everyone
Data-Driven Documents codes.
China tencent open source team.