Please hold all commits until I get things back under control

Edward K. Ream

unread,

Oct 12, 2020, 4:20:35 PM10/12/20

to leo-editor

We have had a chaotic day, with branches improperly merged into each other. This has created a right mess.

Please do not push any commits anywhere except your own private branches.

Edward

Edward K. Ream

unread,

Oct 13, 2020, 5:47:00 AM10/13/20

to leo-editor

On Monday, October 12, 2020 at 3:20:35 PM UTC-5, Edward K. Ream wrote:

We have had a chaotic day, with branches improperly merged into each other. This has created a right mess.

Please do not push any commits anywhere except your own private branches.

I have made substantial progress untangling the mess.

It will likely take several more hours of work to be sure that everything is as it should be.

Please continue to hold all commits to my branches. I'll let you know when devel is back open.

Edward

Edward K. Ream

unread,

Oct 13, 2020, 11:13:15 AM10/13/20

to leo-editor

On Tuesday, October 13, 2020 at 4:47:00 AM UTC-5, Edward K. Ream wrote:

It will likely take several more hours of work to be sure that everything is as it should be.

Please continue to hold all commits to my branches. I'll let you know when devel is back open.

The devel branch seems to be in reasonable shape, so let's declare the emergency over. It should be safe to create new branches based on devel.

I have deleted the layout2 branch because I no longer had any idea which parts of it were usable. Close examination of the diffs in devel indicate that no important code was likely changed or lost.

Edward

Reply all

Reply to author

Forward