Re: [git-users] How to get a highly complex branch straight?

2017-05-05 Thread Zero point minus two
Ah, but you don't understand. Git branches are not *meant* to be straight. They are meant to be crooky! 2017-05-03 20:56 GMT+02:00 Michael : > > On 2017-05-02, at 10:30 AM, Michael wrote: > > > > > On 2017-05-02, at 10:22 AM, m...@jump-ing.de wrote: > >

Re: [git-users] How to get a highly complex branch straight?

2017-05-05 Thread Markus Hitter
Am 05.05.2017 um 19:43 schrieb Michael: > I read as much as I could about the Mikado method, and it turned out that all > the basics of the method are available, either in their website, or their > sample chapters, etc. > > Basically, you add two things to the normal cycle of improvement. > >

[git-users] staging or no staging in system files?

2017-05-05 Thread Zero point minus two
What are best practices for having a repo that feeds into system configuration? The problem is that Git repos are not stable; ie if you mess it up you would mess up your system if the system files are symlinked to it. So you either have to install the files into their final destination or

Re: [git-users] How to get a highly complex branch straight?

2017-05-05 Thread Michael
On 2017-05-02, at 12:47 PM, m...@jump-ing.de wrote: > > > > The Mikado method [2] is one approach to avoiding a merge hell of trying to > > do everything at once. > > Here's another method I use for several years already, with great success: >

Re: [git-users] How to get a highly complex branch straight?

2017-05-05 Thread Michael
On 2017-05-05, at 11:47 AM, Markus Hitter wrote: > Am 05.05.2017 um 19:43 schrieb Michael: >> I read as much as I could about the Mikado method, and it turned out that >> all the basics of the method are available, either in their website, or >> their sample chapters, etc.

Re: [git-users] How to get a highly complex branch straight?

2017-05-05 Thread Philip Oakley
Hi Markus, - Original Message - Am 05.05.2017 um 19:43 schrieb Michael: I read as much as I could about the Mikado method, and it turned out that all the basics of the method are available, either in their website, or their sample chapters, etc. Basically, you add two things to the

[git-users] Re: staging or no staging in system files?

2017-05-05 Thread Mark Waite
On Friday, May 5, 2017 at 10:28:38 AM UTC-6, Zero point minus two wrote: > > What are best practices for having a repo that feeds into system > configuration? > > The "etckeeper" program available on some Linux distributions places the git repository in the system configuration directory. In