git is a distributed version control system. git is free software. git has a index change 1 change 2 This is from branch dev Update from master and feature1 merge using fast forward merge without fast forward debug test This is a bug,fix it This is from branch dev edit form github