Re: For devs: commit only to devel, except maybe branches.md

2018-03-02 Thread Edward K. Ream
On Fri, Mar 2, 2018 at 9:27 PM, Matt Wilkie wrote: ​​ Generally speaking I should usually be the only one committing to master. >> And that should happen only when merging a release branch into master. >> > ​Vitalije and I agree that there are reasons for committing to master. See my previous co

Re: For devs: commit only to devel, except maybe branches.md

2018-03-02 Thread Edward K. Ream
On Fri, Mar 2, 2018 at 8:19 PM, vitalije wrote: ​> ​ What about fixing bugs? Should they also go to devel? ​Heh. I was just going to write about this. Reminds me of this joke: ​​ In theory, theory and practice are the same thing. In practice they're different. ​> ​ I have committed recent

Re: For devs: commit only to devel, except maybe branches.md

2018-03-02 Thread Matt Wilkie
> Generally speaking I should usually be the only one committing to master. > And that should happen only when merging a release branch into master. > https://github.com/leo-editor/leo-editor/settings/branches has settings for specifying the default branch and marking branches as protected (l

Re: For devs: commit only to devel, except maybe branches.md

2018-03-02 Thread vitalije
What about fixing bugs? Should they also go to devel? I have committed recently a fix for the bug that nobody has reported yet, but which has caused me some data loss. On Saturday, March 3, 2018 at 12:34:24 AM UTC+1, Edward K. Ream wrote: > > Generally speaking I should usually be the only one

For devs: commit only to devel, except maybe branches.md

2018-03-02 Thread Edward K. Ream
Generally speaking I should usually be the only one committing to master. And that should happen only when merging a release branch into master. However, committing branches.md in master is harmless. You can then merge master into devel. *Not the other way!*Edward -- You received this mes