Le 03/05/2016 16:56, Robert Ramey a écrit :
I'm sure somewhere we have a "tool", git command, script or whatever which can create a report which shows which libraries have differences between develop and master branches in a concise way. So maybe the release procedure should start with a generation and display of this report followed by nagging of developers to get them in sync. Once they're in sync, developers would be admonished not to check into develop until the master is checked. One great thing about git is that it lets me easily create a temporary local branch in which I can store my local changes then merge them into develop as soon as the release ships. To summarize:
a) announce intention to ship master b) encourage developers to sync develop to master c) prepare summary report of differences d) review tests on master branch, ship beta, etc. cycle until done. e) ship release, open master and develop for changes.
we want to maintain the distinction between master and develop. But during a hopefully short time, they should be in sync.
When I have to fix a bug I need to commit in develop so that I can check if this is a fix and if there is no regressions. Vicente