Reading Time: 4 minutes Back to coding. When working on the same file at the same time, the old joke is try to check in your code change before the other girl (guy) does. This way you don’t have to worry about the merge (meaning, put in your code change while keeping the other person’s code changes). In this
AAA
blog
Dev
finance
Links
Major
Saint Louis
side-money
Follow Us
Meta
Google Ads
Archives
Pages
Recent Posts
Tags
401K
app
apple
baidu
berkshire
berkshire-hathaway
blackberry
BRK.B
Buffett
CFA
China
China-mobile
China-Stock-Market
CHL
credit-card
Crocs
CROX
EDU
GM
Google
Heelys
HLYS
HMIN
home-inns
ICBC
iPhone
ipo
IRA
LFC
LFT
longtop
mcdonald
Mindray
MR
new-oriental
NINE
Panera
retirement-calculator
sbux
shanghai
shanghai-composite-index
starbucks
Vanke
Warren-Buffett
XFML
Categories
- 401k and Personal Finance
- advice and tips
- Beijing Olympics
- Business
- car
- Career
- CFA
- China
- Chinese articles
- DIY
- earning
- Economy
- Edu-and-Ladue-School
- exports
- Featured
- finance
- Fun
- Fun Video
- gadgets
- Investing
- iOS
- iPhone app
- IPO
- Java
- kids
- Life
- Life Tips
- Master Series
- math-and-edu
- Politics
- Saint Louis
- Shanghai Composite
- Site Info
- Software development
- Stocks
- Technology
- Travel
- Uncategorized
- video
- Web
- Windows
Recent Comments