- torek ( ), git , , , , . , .
- , , ( " " ), git master , .
. , git . , ,
A --- B --- C <--(master)
\
D <--(feature)
D " " ; , " diff" . feature - ; . , git .
C " " , "diff from newer-version of-file" . , , , . , master develop, develop , master . , - , .
. , master, , , LFS ( , ). , , . , , " ", , , .
2 - - master - . ,
git checkout master
git branch featureOldMasterBranch
git checkout featureBranch
git branch -f master
, master , featureOldMasterBranch , .
, - , , , - , .. - , - - master.