Hi,
As it seems we have serious political talks spread around various issues and pull requests, it could be a good idea to keep them in one place so it will be easier for all to follow.
One of the most important is the master branch state after merging the NewUI.
The situation now is that there are some pull req. hanging while @arthurbenemann is merging some new code or fast fixes. In the mean time @azrin asked to freeze the code /master or requests? I assume requests/.
Let's discuss the problem using main strings.xml as the example:
https://github.com/arthurbenemann/droidplanner/commits/master/DroidPlanner/res/values/strings.xml
if you would look into the top commit you will see changes like adding 3 lines:
https://github.com/arthurbenemann/droidplanner/commit/accdf2f3c840cf67ee553b56ee4c253f287c0e3a#diff-d968c6f4734582c451eeec7eb6a4f225R214
+ <string name="screen_tuning">Tuning</string>
+ <string name="screen_modes">Modes</string>
+ <string name="screen_checklist">Checklist</string>
it's simple for human but will confuse git as there is another request hanging (from me btw) changing the lines just above ("fasil" changed to "failsafe" or on other place "conect" to "connected")
https://github.com/Paku-/droidplanner/commit/21c09735f8ba2512bc27074c566199ff8a7a1115
So we (or @arthurbenemann ) will get conflict of he tries to merge this request.
What's more he is not familiar with changes I made so could not be able to resolve it properly.
So what is the solution ...
1.Do not allow requests to hang to long /so master is not changing in the mean time/. If it did read p.3
2.Do not keep your code locally to long as long running branches make mess ..
3. @arthurbenemann should force author to pull master and resolve conflicts locally before merging the request (it seems to me github includes them then automatically )
4. keep requests merging based on their timebase (not so easy but possible).
Finall /periodically synchronized/ request looks ugly:
https://github.com/arthurbenemann/droidplanner/pull/446
but by keeping it up to date and resolved (DEVMaster):
https://github.com/arthurbenemann/droidplanner/network
it should be easy for @arthurbenemann to merge with one click only ... (hope so)
@azrin: freezing means all or most of hanging requests will produce conflicts ...
so (as above) they should me merge fast or kept in synch with every @arthurbenemann's update ....
sorry for long speech,hope it will help a little ...