2019-06-19 GnuCash IRC logs
00:34:21 *** Mechtilde has joined #gnucash
00:35:09 *** boldstripe has quit IRC
00:37:44 *** ArtGravity has joined #gnucash
00:37:44 *** ChanServ sets mode: +v ArtGravity
00:44:22 *** ArtGravity has quit IRC
00:51:43 *** omnireq has quit IRC
01:03:29 *** omnireq has joined #gnucash
01:50:04 *** ecdhe has quit IRC
01:50:10 *** gour has joined #gnucash
01:59:04 *** Mechtilde has quit IRC
02:02:46 *** gjanssens has joined #gnucash
02:02:46 *** ChanServ sets mode: +o gjanssens
02:03:06 *** gjanssens sets mode: +o gncbot
02:48:57 <gjanssens> chris: I confirm there are no current merge conflicts when merging maint into master
02:49:12 <gjanssens> As far as I'm concerned you're welcome to do such merges.
02:49:36 <gjanssens> Just be extra careful *never* to merge the other way!
02:50:14 <gjanssens> So to be clear: 'git checkout master; git merge maint' is ok, the other way around is not.
02:51:19 <gjanssens> Branching and merging is one of git's strong points and an important factor in our decision to move away from svn.
02:51:58 <gjanssens> It's not perfect so it's always wise to check after the merge if everything still works.
02:53:13 <gjanssens> FYI I have added
02:53:15 <gjanssens> [merge]
02:53:15 <gjanssens> tool = kdiff3
02:53:15 <gjanssens> To my local git config file
02:53:52 <gjanssens> And now whenever I have a merge conflict, I run 'git mergetool' to get a visual tool to help me resolve the conflicts
02:54:21 <gjanssens> I have been using this for months now and I'm amazed at kdiff3's conflict resolution.
02:55:22 <gjanssens> It manages to resolve several more than git itself automatically so I have even less conflicts to resolve manually.
02:56:13 <gjanssens> I remain careful though and double check all conflicts, whether they were resolved manually or by the tool.
03:03:25 *** bertbob has quit IRC
03:09:48 <gjanssens> chris: Another fyi - I have pushed a maint -> master merge as we speak. I had it on my list still.
03:10:42 *** bertbob has joined #gnucash
03:10:42 *** ChanServ sets mode: +v bertbob
03:16:03 *** omnireq has quit IRC
03:21:50 *** omnireq has joined #gnucash
03:21:50 *** ChanServ sets mode: +v omnireq
03:25:12 *** bertbob has quit IRC
03:34:02 *** bertbob has joined #gnucash
03:34:04 *** ChanServ sets mode: +v bertbob
03:50:41 *** AdrianoKF has joined #gnucash
03:50:41 *** ChanServ sets mode: +v AdrianoKF
03:51:19 *** omnireq has quit IRC
03:51:37 *** AdrianoKF has quit IRC
03:51:48 *** AdrianoKF has joined #gnucash
03:51:48 *** ChanServ sets mode: +v AdrianoKF
04:08:11 *** flips has quit IRC
04:15:05 *** MarkFirewhal has quit IRC
04:16:39 *** flips has joined #gnucash
04:16:40 *** ChanServ sets mode: +v flips
04:16:41 *** btwe has joined #gnucash
04:18:10 *** gour has quit IRC
04:28:33 *** MarkFirewhal has joined #gnucash
04:31:01 *** fabior has joined #gnucash
04:39:11 *** Mechtilde has joined #gnucash
04:40:25 *** omnireq has joined #gnucash
04:40:26 *** ChanServ sets mode: +v omnireq
04:45:23 *** fabior has quit IRC
04:57:45 *** storyjesse has joined #gnucash
05:00:23 *** dantob has joined #gnucash
05:10:31 *** fabior has joined #gnucash
05:20:49 *** fabior has quit IRC
05:57:32 *** bertbob has quit IRC
06:01:23 *** bertbob has joined #gnucash
06:01:23 *** ChanServ sets mode: +v bertbob
06:10:50 *** Aussie_matt has quit IRC
06:19:15 *** oozer has joined #gnucash
06:35:57 *** Jimraehl1 has joined #gnucash
06:37:23 *** Jimraehl1 has left #gnucash
06:42:26 *** bertbob has quit IRC
06:46:43 *** bertbob has joined #gnucash
06:46:44 *** ChanServ sets mode: +v bertbob
06:49:48 *** fabior has joined #gnucash
06:55:13 *** fabior has quit IRC
07:07:25 *** dantob has quit IRC
07:35:35 *** jervin has joined #gnucash
07:42:20 *** KevinDB has quit IRC
07:43:34 *** KevinDB has joined #gnucash
07:43:34 *** ChanServ sets mode: +v KevinDB
07:46:15 *** KevinDB- has joined #gnucash
07:46:15 *** ChanServ sets mode: +v KevinDB-
07:47:22 *** KevinDB- has quit IRC
07:47:50 *** KevinDB has quit IRC
07:48:10 *** KevinDB- has joined #gnucash
07:48:10 *** ChanServ sets mode: +v KevinDB-
07:49:58 *** KevinDB- has quit IRC
07:51:23 *** KevinDB has joined #gnucash
07:51:23 *** ChanServ sets mode: +v KevinDB
08:02:13 *** adriano_kf has joined #gnucash
08:04:12 *** AdrianoKF has quit IRC
08:17:22 *** arumpold has joined #gnucash
08:19:43 *** adriano_kf has quit IRC
08:20:16 *** AdrianoKF has joined #gnucash
08:20:16 *** ChanServ sets mode: +v AdrianoKF
08:22:13 *** arumpold has quit IRC
08:25:28 *** mr_sm11th has joined #gnucash
08:25:28 *** ChanServ sets mode: +v mr_sm11th
08:41:23 *** adriano_kf has joined #gnucash
08:42:06 *** arumpold has joined #gnucash
08:43:43 *** AdrianoKF has quit IRC
08:44:43 *** adriano_kf has quit IRC
08:49:44 *** chris has quit IRC
08:51:01 *** chris has joined #gnucash
08:51:01 *** ChanServ sets mode: +v chris
09:01:41 *** oozer has quit IRC
09:03:46 *** AdrianoKF has joined #gnucash
09:03:46 *** ChanServ sets mode: +v AdrianoKF
09:04:43 *** arumpold has quit IRC
09:06:30 *** boldstripe has joined #gnucash
09:14:27 *** adriano_kf has joined #gnucash
09:16:44 *** AdrianoKF has quit IRC
09:19:09 *** arumpold has joined #gnucash
09:21:13 *** adriano_kf has quit IRC
09:27:21 *** adriano_kf has joined #gnucash
09:28:33 *** AdrianoKF has joined #gnucash
09:28:34 *** ChanServ sets mode: +v AdrianoKF
09:29:03 *** jervin has quit IRC
09:29:44 *** arumpold has quit IRC
09:30:25 *** adriano_kf has quit IRC
09:37:19 *** arumpold has joined #gnucash
09:39:13 *** AdrianoKF has quit IRC
09:39:47 *** AdrianoKF has joined #gnucash
09:39:48 *** ChanServ sets mode: +v AdrianoKF
09:40:30 *** adriano_kf has joined #gnucash
09:41:44 *** arumpold has quit IRC
09:42:50 *** AdrianoKF has quit IRC
09:44:36 *** arumpold has joined #gnucash
09:45:42 *** AdrianoKF has joined #gnucash
09:45:42 *** ChanServ sets mode: +v AdrianoKF
09:47:14 *** adriano_kf has quit IRC
09:47:44 *** arumpold has quit IRC
09:48:45 *** AdrianoKF has quit IRC
09:49:16 *** arumpold has joined #gnucash
09:55:10 *** arumpold has quit IRC
09:58:19 *** AdrianoKF has joined #gnucash
09:58:19 *** ChanServ sets mode: +v AdrianoKF
10:02:12 *** gour has joined #gnucash
10:02:12 *** ChanServ sets mode: +v gour
10:08:26 *** gour1 has joined #gnucash
10:10:12 *** gour has quit IRC
10:23:31 *** oozer has joined #gnucash
10:26:21 *** fabior has joined #gnucash
10:29:23 *** fabior has quit IRC
10:30:15 *** kael has joined #gnucash
10:30:15 *** ChanServ sets mode: +v kael
10:41:00 *** medical-democrat has joined #gnucash
10:41:00 *** ChanServ sets mode: +v medical-democrat
10:42:25 *** jervin has joined #gnucash
10:48:54 *** ArtGravity has joined #gnucash
10:49:01 *** ChanServ sets mode: +v ArtGravity
10:58:17 *** jervin has quit IRC
11:02:32 *** kael has quit IRC
11:10:47 *** gour1 has quit IRC
11:15:25 *** gour has joined #gnucash
11:15:25 *** ChanServ sets mode: +v gour
11:20:34 *** Mechtilde has quit IRC
11:42:13 *** fell has quit IRC
11:42:23 *** fell has joined #gnucash
11:42:23 *** ChanServ sets mode: +o fell
11:45:27 *** guak has joined #gnucash
11:52:52 *** fell has quit IRC
11:54:46 *** ArtGravity has quit IRC
11:59:40 *** ArtGravity has joined #gnucash
11:59:40 *** ChanServ sets mode: +v ArtGravity
12:16:53 *** Mechtilde has joined #gnucash
12:32:00 *** ecdhe has joined #gnucash
12:35:05 *** jervin has joined #gnucash
12:39:23 *** jervin has quit IRC
12:59:39 *** AdrianoKF has quit IRC
13:01:34 *** fell has joined #gnucash
13:01:34 *** ChanServ sets mode: +o fell
13:05:03 *** calvinct has joined #gnucash
13:14:04 *** calvinct has quit IRC
13:26:59 *** storyjesse has quit IRC
13:36:01 *** calvinct has joined #gnucash
13:40:46 *** oozer has quit IRC
14:32:31 *** oozer has joined #gnucash
14:43:53 *** fell has quit IRC
14:43:59 *** fell has joined #gnucash
14:43:59 *** ChanServ sets mode: +o fell
14:44:31 *** jervin has joined #gnucash
14:53:52 *** Mechtilde has quit IRC
14:55:24 *** jervin has quit IRC
15:25:00 *** boldstripe has quit IRC
15:25:55 *** boldstripe has joined #gnucash
16:23:51 *** calvinct has quit IRC
16:24:34 *** calvinct has joined #gnucash
16:36:04 *** calvinct has quit IRC
16:36:10 *** calvinct has joined #gnucash
16:36:53 *** gjanssens has quit IRC
17:04:41 *** calvinct has quit IRC
17:05:59 *** medical-democrat has quit IRC
17:08:04 *** jervin has joined #gnucash
17:18:58 *** calvinct has joined #gnucash
17:25:41 *** boldstripe has quit IRC
17:26:37 *** boldstripe has joined #gnucash
17:39:41 *** fell has quit IRC
17:43:21 *** fell has joined #gnucash
17:43:21 *** ChanServ sets mode: +o fell
17:45:38 *** calvinct has quit IRC
17:59:11 *** jervin has quit IRC
17:59:37 *** mr_sm11th has quit IRC
18:13:30 *** fell has quit IRC
18:14:31 *** fell has joined #gnucash
18:14:31 *** ChanServ sets mode: +o fell
18:17:41 *** fell has quit IRC
18:17:52 *** Grav has joined #gnucash
18:18:32 *** ArtGravity has quit IRC
18:20:54 *** Grav is now known as help
18:21:04 *** help is now known as ArtGravity
18:21:21 *** ChanServ sets mode: +v ArtGravity
18:21:34 *** gour has quit IRC
18:41:29 *** Aussie_matt has joined #gnucash
18:49:02 *** ArtGravity has quit IRC
18:56:46 *** fell has joined #gnucash
18:56:46 *** ChanServ sets mode: +o fell
19:04:16 *** fell has quit IRC
19:26:22 *** boldstripe has quit IRC
19:27:17 *** boldstripe has joined #gnucash
20:20:50 *** guak has quit IRC
20:41:12 *** jervin has joined #gnucash
20:49:44 *** jervin has quit IRC
21:02:07 *** fell has joined #gnucash
21:02:07 *** ChanServ sets mode: +o fell
21:27:02 *** boldstripe has quit IRC
21:27:57 *** boldstripe has joined #gnucash
21:41:08 *** oozer has quit IRC
22:16:25 *** dantob has joined #gnucash
22:47:50 *** jervin has joined #gnucash
23:12:06 *** storyjesse has joined #gnucash
23:27:43 *** boldstripe has quit IRC
23:28:39 *** boldstripe has joined #gnucash