working on dev branch
commit after stash apply
commit changes after appling stash on firmware
before squash
a
b
after merging and conflic resolve
work on dev
firmware work on same file
merge with dev branch
change on dev
change on firmware
change on firmware
firmware new functions
new functions on firmware
dev branch
merging
this is merge
firmware
dev