some more merges from gerrit
- removed files - modified drivers - fixed READE.md Change-Id: I47ae486df4dde3d60cc5e0e328194718dd396d87
This commit is contained in:
@ -38,7 +38,7 @@ changes are done, eventually a sync step should happen:
|
||||
1) ideally, this is done when work and wip match
|
||||
2) make sure branches mlz, master, wip and work are in sync with remote, push/pull otherwise
|
||||
3) cherry-pick commits from mlz to master
|
||||
4) make sure master and mlz branches match (git diff --name-only master..wip should only return README.md)
|
||||
4) make sure master and mlz branches match (git diff --name-only master..mlz should only return README.md)
|
||||
5) create branch new_work from master
|
||||
6) go through commits in wip and sort out:
|
||||
- core commits already pushed through gerrit are skipped
|
||||
|
Reference in New Issue
Block a user