Re: Finally getting around to switching to Git

2019-04-26 Thread Tim Funk
Or maybe confluence cwiki? -Tim On Fri, Apr 26, 2019 at 8:26 AM Coty Sutherland wrote: > On Fri, Apr 26, 2019 at 3:13 AM Mark Thomas wrote: > ... > > I'd suggest sharing Git experiences is a topic of conversation at the > > Hackathon. > > > > +1, except I won't be there :( Is that something we

Re: Finally getting around to switching to Git

2019-04-26 Thread Coty Sutherland
On Fri, Apr 26, 2019 at 3:13 AM Mark Thomas wrote: > On 25/04/2019 20:07, Christopher Schultz wrote: > > On 4/25/19 14:03, Igal Sapir wrote: > > > > >> In some projects it's easy to maintain a single repository and > >> switch between branches, but I find the differences between 7.0.x > >> and m

Re: Finally getting around to switching to Git

2019-04-26 Thread Mark Thomas
On 25/04/2019 20:07, Christopher Schultz wrote: > On 4/25/19 14:03, Igal Sapir wrote: >> In some projects it's easy to maintain a single repository and >> switch between branches, but I find the differences between 7.0.x >> and master to be so major that I chose to follow Mark's method and >> ke

Re: Finally getting around to switching to Git

2019-04-25 Thread Igal Sapir
Chris, On 4/25/2019 12:07 PM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/25/19 14:03, Igal Sapir wrote: Chris, On 4/25/2019 10:32 AM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wr

Re: Finally getting around to switching to Git

2019-04-25 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/25/19 14:03, Igal Sapir wrote: > Chris, > > On 4/25/2019 10:32 AM, Christopher Schultz wrote: >> -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 >> >> Igal, >> >> On 4/23/19 12:52, Igal Sapir wrote: >>> Another thing that I have change

Re: Finally getting around to switching to Git

2019-04-25 Thread Igal Sapir
Coty, On 4/25/2019 11:30 AM, Coty Sutherland wrote: On Thu, Apr 25, 2019 at 2:06 PM Igal Sapir wrote: On 4/25/2019 10:56 AM, Coty Sutherland wrote: On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < ch...@christopherschultz.net> wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Ig

Re: Finally getting around to switching to Git

2019-04-25 Thread Coty Sutherland
On Thu, Apr 25, 2019 at 2:06 PM Igal Sapir wrote: > On 4/25/2019 10:56 AM, Coty Sutherland wrote: > > On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < > > ch...@christopherschultz.net> wrote: > > > >> -BEGIN PGP SIGNED MESSAGE- > >> Hash: SHA256 > >> > >> Igal, > >> > >> On 4/23/19 1

Re: Finally getting around to switching to Git

2019-04-25 Thread Igal Sapir
On 4/25/2019 10:56 AM, Coty Sutherland wrote: On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < ch...@christopherschultz.net> wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: Another thing that I have changed in my workflow based on Mark's

Re: Finally getting around to switching to Git

2019-04-25 Thread Igal Sapir
Chris, On 4/25/2019 10:32 AM, Christopher Schultz wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: Another thing that I have changed in my workflow based on Mark's past suggestion, is that I keep a local repo for each major branch now. Okay, I

Re: Finally getting around to switching to Git

2019-04-25 Thread Coty Sutherland
On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Igal, > > On 4/23/19 12:52, Igal Sapir wrote: > > Another thing that I have changed in my workflow based on Mark's > > past suggestion, is that I keep

Re: Finally getting around to switching to Git

2019-04-25 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: > Another thing that I have changed in my workflow based on Mark's > past suggestion, is that I keep a local repo for each major branch > now. Okay, I have done the following: 1. Fork tomcat master to my o

Re: Finally getting around to switching to Git

2019-04-24 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Igal, On 4/23/19 12:52, Igal Sapir wrote: > On 4/23/2019 8:48 AM, Martin Grigorov wrote: >> On Tue, Apr 23, 2019, 17:29 Christopher Schultz < >> ch...@christopherschultz.net> wrote: >> >>> > Setting up the account is needed. I failed to

Re: Finally getting around to switching to Git

2019-04-24 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Martin, On 4/23/19 11:48, Martin Grigorov wrote: > On Tue, Apr 23, 2019, 17:29 Christopher Schultz < Anyone with the > Karma to do so, can I be added to ASF-org on GitHub? My GitHub > username is ChristopherSchultz. > > >> Go to https://id.apache.

Re: Finally getting around to switching to Git

2019-04-23 Thread Igal Sapir
On 4/23/2019 8:48 AM, Martin Grigorov wrote: On Tue, Apr 23, 2019, 17:29 Christopher Schultz < ch...@christopherschultz.net> wrote: Setting up the account is needed. I failed to do it, and Mark told me I needed three green ticks there: https://gitbox.apache.org/setup/ Thanks. Looks like I'

Re: Finally getting around to switching to Git

2019-04-23 Thread Martin Grigorov
On Tue, Apr 23, 2019, 17:29 Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Rémy, > > On 4/23/19 10:07, Rémy Maucherat wrote: > > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz < > > ch...@christopherschultz.net> wrote: > > >

Re: Finally getting around to switching to Git

2019-04-23 Thread Coty Sutherland
On Tue, Apr 23, 2019 at 10:33 AM Rémy Maucherat wrote: > On Tue, Apr 23, 2019 at 4:29 PM Christopher Schultz < > ch...@christopherschultz.net> wrote: > > > -BEGIN PGP SIGNED MESSAGE- > > Hash: SHA256 > > > > Rémy, > > > > On 4/23/19 10:07, Rémy Maucherat wrote: > > > On Tue, Apr 23, 2019

Re: Finally getting around to switching to Git

2019-04-23 Thread Rémy Maucherat
On Tue, Apr 23, 2019 at 4:29 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > Rémy, > > On 4/23/19 10:07, Rémy Maucherat wrote: > > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz < > > ch...@christopherschultz.net> wrote: >

Re: Finally getting around to switching to Git

2019-04-23 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Rémy, On 4/23/19 10:07, Rémy Maucherat wrote: > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz < > ch...@christopherschultz.net> wrote: > > All, > > I haven't updated my local working copies of Tomcat source since > the move to Git. I'm goin

Re: Finally getting around to switching to Git

2019-04-23 Thread Christopher Schultz
-BEGIN PGP SIGNED MESSAGE- Hash: SHA256 Rémy, On 4/23/19 10:07, Rémy Maucherat wrote: > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz < > ch...@christopherschultz.net> wrote: > > All, > > I haven't updated my local working copies of Tomcat source since > the move to Git. I'm goin

Re: Finally getting around to switching to Git

2019-04-23 Thread Rémy Maucherat
On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz < ch...@christopherschultz.net> wrote: > -BEGIN PGP SIGNED MESSAGE- > Hash: SHA256 > > All, > > I haven't updated my local working copies of Tomcat source since the > move to Git. I'm going to do that, now, and I'm looking for advice. > >