Submit Search
Upload
Git Flow and JavaScript Coding Style
•
15 likes
•
5,225 views
Bo-Yi Wu
Follow
* Git Rebase vs Git Merge * JavaScript Coding Style
Read less
Read more
Technology
Report
Share
Report
Share
1 of 38
Download Now
Download to read offline
Recommended
Git flow Introduction
Git flow Introduction
David Paluy
git flow
git flow
Gabriel Gottgtroy Zigolis
Git Tricks — git utilities that make life git easier
Git Tricks — git utilities that make life git easier
Christoph Matthies
Git and git flow
Git and git flow
Fran García
沒有 GUI 的 Git
沒有 GUI 的 Git
Chia Wei Tsai
Git Workflow With Gitflow
Git Workflow With Gitflow
Josh Dvir
Git flow for daily use
Git flow for daily use
Mediacurrent
Git
Git
Shinu Suresh
More Related Content
What's hot
Brief tutorial on Git
Brief tutorial on Git
聖文 鄭
Git Flow - An Introduction
Git Flow - An Introduction
Knoldus Inc.
Open Source Collaboration With Git And Git Hub
Open Source Collaboration With Git And Git Hub
Nick Quaranto
Git Tricks
Git Tricks
Ivelina Dimova
Git-flow workflow and pull-requests
Git-flow workflow and pull-requests
Bartosz Kosarzycki
Git & gitflow
Git & gitflow
Nolifelover Earn
19 GitFlow #burningkeyboards
19 GitFlow #burningkeyboards
Denis Ristic
Git flow
Git flow
Suraj Aair
Git Series. Episode 3. Git Flow and Github-Flow
Git Series. Episode 3. Git Flow and Github-Flow
Mikhail Melnik
Git and git workflow best practice
Git and git workflow best practice
Majid Hosseini
Git basics for beginners
Git basics for beginners
PravallikaTammisetty
Git
Git
Mayank Patel
Git workflows presentation
Git workflows presentation
Mack Hardy
Git flow cheatsheet
Git flow cheatsheet
Funato Takashi
Git introduction for Beginners
Git introduction for Beginners
MortezaTaghaddomi
Git branching-model
Git branching-model
Aaron Huang
Git presentation
Git presentation
Sai Kumar Satapathy
Why Aren't You Using Git Flow?
Why Aren't You Using Git Flow?
John Congdon
Git and git hub
Git and git hub
Sebastiaan Deckers
A painless self-hosted Git service: Gitea
A painless self-hosted Git service: Gitea
Bo-Yi Wu
What's hot
(20)
Brief tutorial on Git
Brief tutorial on Git
Git Flow - An Introduction
Git Flow - An Introduction
Open Source Collaboration With Git And Git Hub
Open Source Collaboration With Git And Git Hub
Git Tricks
Git Tricks
Git-flow workflow and pull-requests
Git-flow workflow and pull-requests
Git & gitflow
Git & gitflow
19 GitFlow #burningkeyboards
19 GitFlow #burningkeyboards
Git flow
Git flow
Git Series. Episode 3. Git Flow and Github-Flow
Git Series. Episode 3. Git Flow and Github-Flow
Git and git workflow best practice
Git and git workflow best practice
Git basics for beginners
Git basics for beginners
Git
Git
Git workflows presentation
Git workflows presentation
Git flow cheatsheet
Git flow cheatsheet
Git introduction for Beginners
Git introduction for Beginners
Git branching-model
Git branching-model
Git presentation
Git presentation
Why Aren't You Using Git Flow?
Why Aren't You Using Git Flow?
Git and git hub
Git and git hub
A painless self-hosted Git service: Gitea
A painless self-hosted Git service: Gitea
Viewers also liked
PHP & JavaScript & CSS Coding style
PHP & JavaScript & CSS Coding style
Bo-Yi Wu
How to choose web framework
How to choose web framework
Bo-Yi Wu
Introduction to Grunt.js on Taiwan JavaScript Conference
Introduction to Grunt.js on Taiwan JavaScript Conference
Bo-Yi Wu
Gearman work queue in php
Gearman work queue in php
Bo-Yi Wu
Phpconf 2011 introduction_to_codeigniter
Phpconf 2011 introduction_to_codeigniter
Bo-Yi Wu
Introduction to git
Introduction to git
Bo-Yi Wu
Git flow 與團隊合作
Git flow 與團隊合作
Bo-Yi Wu
Why to choose laravel framework
Why to choose laravel framework
Bo-Yi Wu
用 Docker 改善團隊合作模式
用 Docker 改善團隊合作模式
Bo-Yi Wu
Write microservice in golang
Write microservice in golang
Bo-Yi Wu
How to integrate front end tool via gruntjs
How to integrate front end tool via gruntjs
Bo-Yi Wu
advanced introduction to codeigniter
advanced introduction to codeigniter
Bo-Yi Wu
2014 OSDC Talk: Introduction to Percona XtraDB Cluster and HAProxy
2014 OSDC Talk: Introduction to Percona XtraDB Cluster and HAProxy
Bo-Yi Wu
You must know about CodeIgniter Popular Library
You must know about CodeIgniter Popular Library
Bo-Yi Wu
Introduction to MVC of CodeIgniter 2.1.x
Introduction to MVC of CodeIgniter 2.1.x
Bo-Yi Wu
Docker 基礎介紹與實戰
Docker 基礎介紹與實戰
Bo-Yi Wu
Automating your workflow with Gulp.js
Automating your workflow with Gulp.js
Bo-Yi Wu
Verzovani kodu s Gitem (Karel Minarik)
Verzovani kodu s Gitem (Karel Minarik)
Karel Minarik
Git rebase explained
Git rebase explained
Mahesh Vaidya
Git Rebase vs Merge
Git Rebase vs Merge
Mariam Hakobyan
Viewers also liked
(20)
PHP & JavaScript & CSS Coding style
PHP & JavaScript & CSS Coding style
How to choose web framework
How to choose web framework
Introduction to Grunt.js on Taiwan JavaScript Conference
Introduction to Grunt.js on Taiwan JavaScript Conference
Gearman work queue in php
Gearman work queue in php
Phpconf 2011 introduction_to_codeigniter
Phpconf 2011 introduction_to_codeigniter
Introduction to git
Introduction to git
Git flow 與團隊合作
Git flow 與團隊合作
Why to choose laravel framework
Why to choose laravel framework
用 Docker 改善團隊合作模式
用 Docker 改善團隊合作模式
Write microservice in golang
Write microservice in golang
How to integrate front end tool via gruntjs
How to integrate front end tool via gruntjs
advanced introduction to codeigniter
advanced introduction to codeigniter
2014 OSDC Talk: Introduction to Percona XtraDB Cluster and HAProxy
2014 OSDC Talk: Introduction to Percona XtraDB Cluster and HAProxy
You must know about CodeIgniter Popular Library
You must know about CodeIgniter Popular Library
Introduction to MVC of CodeIgniter 2.1.x
Introduction to MVC of CodeIgniter 2.1.x
Docker 基礎介紹與實戰
Docker 基礎介紹與實戰
Automating your workflow with Gulp.js
Automating your workflow with Gulp.js
Verzovani kodu s Gitem (Karel Minarik)
Verzovani kodu s Gitem (Karel Minarik)
Git rebase explained
Git rebase explained
Git Rebase vs Merge
Git Rebase vs Merge
Similar to Git Flow and JavaScript Coding Style
Git tips
Git tips
Arthur Shvetsov
Git Distributed Version Control System
Git Distributed Version Control System
Victor Wong
simple Git
simple Git
Caesar Chi
Git and Github slides.pdf
Git and Github slides.pdf
Tilton2
Git and Github workshop ppt slide by slide
Git and Github workshop ppt slide by slide
RaghavendraVattikuti1
Introduction To Git Workshop
Introduction To Git Workshop
themystic_ca
Git cheat-sheets
Git cheat-sheets
ozone777
Introduction into Git
Introduction into Git
Serhii Kartashov
Wokshop de Git
Wokshop de Git
Alberto Leal
Talk to git
Talk to git
YenTing Chen
Session git
Session git
Roni Saha
Collaborative development with Git | Workshop
Collaborative development with Git | Workshop
Anuchit Chalothorn
Git Started With Git
Git Started With Git
Nick Quaranto
Git tutorial
Git tutorial
mobaires
Git Tech Talk
Git Tech Talk
Chris Johnson
Git basics
Git basics
Amit Sawhney
Git - Workshop Disruptiva
Git - Workshop Disruptiva
Bruno Almeida
git fail --force (make it up with your pull requests)
git fail --force (make it up with your pull requests)
Carlos Duarte do Nascimento
Git
Git
IT Booze
Git workshop
Git workshop
Ray Toal
Similar to Git Flow and JavaScript Coding Style
(20)
Git tips
Git tips
Git Distributed Version Control System
Git Distributed Version Control System
simple Git
simple Git
Git and Github slides.pdf
Git and Github slides.pdf
Git and Github workshop ppt slide by slide
Git and Github workshop ppt slide by slide
Introduction To Git Workshop
Introduction To Git Workshop
Git cheat-sheets
Git cheat-sheets
Introduction into Git
Introduction into Git
Wokshop de Git
Wokshop de Git
Talk to git
Talk to git
Session git
Session git
Collaborative development with Git | Workshop
Collaborative development with Git | Workshop
Git Started With Git
Git Started With Git
Git tutorial
Git tutorial
Git Tech Talk
Git Tech Talk
Git basics
Git basics
Git - Workshop Disruptiva
Git - Workshop Disruptiva
git fail --force (make it up with your pull requests)
git fail --force (make it up with your pull requests)
Git
Git
Git workshop
Git workshop
More from Bo-Yi Wu
Drone CI/CD 自動化測試及部署
Drone CI/CD 自動化測試及部署
Bo-Yi Wu
用 Go 語言打造多台機器 Scale 架構
用 Go 語言打造多台機器 Scale 架構
Bo-Yi Wu
Job Queue in Golang
Job Queue in Golang
Bo-Yi Wu
Golang Project Layout and Practice
Golang Project Layout and Practice
Bo-Yi Wu
Introduction to GitHub Actions
Introduction to GitHub Actions
Bo-Yi Wu
Drone 1.0 Feature
Drone 1.0 Feature
Bo-Yi Wu
Drone CI/CD Platform
Drone CI/CD Platform
Bo-Yi Wu
GraphQL IN Golang
GraphQL IN Golang
Bo-Yi Wu
Go 語言基礎簡介
Go 語言基礎簡介
Bo-Yi Wu
drone continuous Integration
drone continuous Integration
Bo-Yi Wu
Gorush: A push notification server written in Go
Gorush: A push notification server written in Go
Bo-Yi Wu
用 Drone 打造輕量級容器持續交付平台
用 Drone 打造輕量級容器持續交付平台
Bo-Yi Wu
用 Go 語言打造微服務架構
用 Go 語言打造微服務架構
Bo-Yi Wu
Introduction to Gitea with Drone
Introduction to Gitea with Drone
Bo-Yi Wu
運用 Docker 整合 Laravel 提升團隊開發效率
運用 Docker 整合 Laravel 提升團隊開發效率
Bo-Yi Wu
用 Go 語言實戰 Push Notification 服務
用 Go 語言實戰 Push Notification 服務
Bo-Yi Wu
用 Go 語言打造 DevOps Bot
用 Go 語言打造 DevOps Bot
Bo-Yi Wu
More from Bo-Yi Wu
(17)
Drone CI/CD 自動化測試及部署
Drone CI/CD 自動化測試及部署
用 Go 語言打造多台機器 Scale 架構
用 Go 語言打造多台機器 Scale 架構
Job Queue in Golang
Job Queue in Golang
Golang Project Layout and Practice
Golang Project Layout and Practice
Introduction to GitHub Actions
Introduction to GitHub Actions
Drone 1.0 Feature
Drone 1.0 Feature
Drone CI/CD Platform
Drone CI/CD Platform
GraphQL IN Golang
GraphQL IN Golang
Go 語言基礎簡介
Go 語言基礎簡介
drone continuous Integration
drone continuous Integration
Gorush: A push notification server written in Go
Gorush: A push notification server written in Go
用 Drone 打造輕量級容器持續交付平台
用 Drone 打造輕量級容器持續交付平台
用 Go 語言打造微服務架構
用 Go 語言打造微服務架構
Introduction to Gitea with Drone
Introduction to Gitea with Drone
運用 Docker 整合 Laravel 提升團隊開發效率
運用 Docker 整合 Laravel 提升團隊開發效率
用 Go 語言實戰 Push Notification 服務
用 Go 語言實戰 Push Notification 服務
用 Go 語言打造 DevOps Bot
用 Go 語言打造 DevOps Bot
Recently uploaded
UiPath Platform: The Backend Engine Powering Your Automation - Session 1
UiPath Platform: The Backend Engine Powering Your Automation - Session 1
DianaGray10
COMPUTER 10: Lesson 7 - File Storage and Online Collaboration
COMPUTER 10: Lesson 7 - File Storage and Online Collaboration
bruanjhuli
Basic Building Blocks of Internet of Things.
Basic Building Blocks of Internet of Things.
YounusS2
UiPath Community: AI for UiPath Automation Developers
UiPath Community: AI for UiPath Automation Developers
UiPathCommunity
20230202 - Introduction to tis-py
20230202 - Introduction to tis-py
Jamie (Taka) Wang
Igniting Next Level Productivity with AI-Infused Data Integration Workflows
Igniting Next Level Productivity with AI-Infused Data Integration Workflows
Safe Software
Videogame localization & technology_ how to enhance the power of translation.pdf
Videogame localization & technology_ how to enhance the power of translation.pdf
infogdgmi
201610817 - edge part1
201610817 - edge part1
Jamie (Taka) Wang
20230104 - machine vision
20230104 - machine vision
Jamie (Taka) Wang
Crea il tuo assistente AI con lo Stregatto (open source python framework)
Crea il tuo assistente AI con lo Stregatto (open source python framework)
Commit University
COMPUTER 10 Lesson 8 - Building a Website
COMPUTER 10 Lesson 8 - Building a Website
dgelyza
VoIP Service and Marketing using Odoo and Asterisk PBX
VoIP Service and Marketing using Odoo and Asterisk PBX
Tarek Kalaji
UiPath Solutions Management Preview - Northern CA Chapter - March 22.pdf
UiPath Solutions Management Preview - Northern CA Chapter - March 22.pdf
DianaGray10
Bird eye's view on Camunda open source ecosystem
Bird eye's view on Camunda open source ecosystem
Asko Soukka
Artificial Intelligence & SEO Trends for 2024
Artificial Intelligence & SEO Trends for 2024
D Cloud Solutions
9 Steps For Building Winning Founding Team
9 Steps For Building Winning Founding Team
Adam Moalla
Building Your Own AI Instance (TBLC AI )
Building Your Own AI Instance (TBLC AI )
Brian Pichman
How Accurate are Carbon Emissions Projections?
How Accurate are Carbon Emissions Projections?
IES VE
The Data Metaverse: Unpacking the Roles, Use Cases, and Tech Trends in Data a...
The Data Metaverse: Unpacking the Roles, Use Cases, and Tech Trends in Data a...
Aggregage
activity_diagram_combine_v4_20190827.pdfactivity_diagram_combine_v4_20190827.pdf
activity_diagram_combine_v4_20190827.pdfactivity_diagram_combine_v4_20190827.pdf
Jamie (Taka) Wang
Recently uploaded
(20)
UiPath Platform: The Backend Engine Powering Your Automation - Session 1
UiPath Platform: The Backend Engine Powering Your Automation - Session 1
COMPUTER 10: Lesson 7 - File Storage and Online Collaboration
COMPUTER 10: Lesson 7 - File Storage and Online Collaboration
Basic Building Blocks of Internet of Things.
Basic Building Blocks of Internet of Things.
UiPath Community: AI for UiPath Automation Developers
UiPath Community: AI for UiPath Automation Developers
20230202 - Introduction to tis-py
20230202 - Introduction to tis-py
Igniting Next Level Productivity with AI-Infused Data Integration Workflows
Igniting Next Level Productivity with AI-Infused Data Integration Workflows
Videogame localization & technology_ how to enhance the power of translation.pdf
Videogame localization & technology_ how to enhance the power of translation.pdf
201610817 - edge part1
201610817 - edge part1
20230104 - machine vision
20230104 - machine vision
Crea il tuo assistente AI con lo Stregatto (open source python framework)
Crea il tuo assistente AI con lo Stregatto (open source python framework)
COMPUTER 10 Lesson 8 - Building a Website
COMPUTER 10 Lesson 8 - Building a Website
VoIP Service and Marketing using Odoo and Asterisk PBX
VoIP Service and Marketing using Odoo and Asterisk PBX
UiPath Solutions Management Preview - Northern CA Chapter - March 22.pdf
UiPath Solutions Management Preview - Northern CA Chapter - March 22.pdf
Bird eye's view on Camunda open source ecosystem
Bird eye's view on Camunda open source ecosystem
Artificial Intelligence & SEO Trends for 2024
Artificial Intelligence & SEO Trends for 2024
9 Steps For Building Winning Founding Team
9 Steps For Building Winning Founding Team
Building Your Own AI Instance (TBLC AI )
Building Your Own AI Instance (TBLC AI )
How Accurate are Carbon Emissions Projections?
How Accurate are Carbon Emissions Projections?
The Data Metaverse: Unpacking the Roles, Use Cases, and Tech Trends in Data a...
The Data Metaverse: Unpacking the Roles, Use Cases, and Tech Trends in Data a...
activity_diagram_combine_v4_20190827.pdfactivity_diagram_combine_v4_20190827.pdf
activity_diagram_combine_v4_20190827.pdfactivity_diagram_combine_v4_20190827.pdf
Git Flow and JavaScript Coding Style
1.
Git Flow and
Coding Style Bo-Yi Wu 2015/04/10
2.
Agenda • Git merge
vs Git rebase. • JavaScript Coding Style.
3.
Git merge vs
Git rebase
4.
Git merge • Create
your branch – $ git checkout –b ‘response’ • Merge from develop branch – $ git merge develop
6.
git merge develop
8.
New commit Merge branch
'develop' into response (HEAD, response)
10.
git merge develop
again
12.
New commit Merge branch
'develop' into response (HEAD, response)
13.
git checkout develop git
merge --no-ff response
15.
Git rebase • Create
your branch – $ git checkout –b ‘response’ • Merge from master branch – $ git rebase develop
17.
Git rebase master
19.
No more new
commit log
20.
Git rebase master
again
22.
No more new
commit log
23.
Create your new
Pull Request git merge --no-ff respnse
25.
git rebase vs
git merge network graph
27.
Rebase vs Merge
優缺點 rebase merge 避免過多 merge commit log 產生 merge commit log Branch commit log 排到最前面(方便追蹤) 依照時間排序 commit log network graph 清楚 network graph 不易理解 各別 commit 解決 conflict 一次將全部衝突顯示 可任意修改 commit log 可合併多個 commit (避免過多無意義 commit log)
28.
Rebase vs Merge
使用時機 rebase merge 整理 Branch commit log 主分支記錄合併 xxxx branch 非主分支開發無需記錄何時合併主分支 主分支請勿使用 rebase 合併任何分支
29.
Develop Note Please rebase
master branch and test again before creating new Pull Request
30.
JavaScript Coding Style
Guide
31.
原先架構 https://google-styleguide.googlecode.com/svn/trunk/javascriptguide.xml
32.
Google JavaScript Style
Guide 無任何範例可參考
33.
Airbnb JavaScript Style
Guide https://github.com/airbnb/javascript
34.
Airbnb JavaScript Style
Guide 程式碼範例完整 另外也可以參考 ES6 Branch
35.
Yoda Conditions https://en.wikipedia.org/wiki/Yoda_conditions if ($a
=== ‘1’) { // code block } if (‘1’ === $a) { // code block } 程式閱讀性高 程式閱讀性低
36.
Yoda Conditions https://en.wikipedia.org/wiki/Yoda_conditions if ($a
= ‘1’) { // code block } 避免此種情況發生
37.
How to prevent
the condition? Write Unit Test
38.
Thanks
Download Now