2022-08-13 GnuCash IRC logs
01:04:07 *** NoobAlice has quit IRC
01:44:43 *** CDB-Man has quit IRC
01:44:55 *** CDB-Man has joined #gnucash
01:44:55 *** ChanServ sets mode: +v CDB-Man
01:58:10 *** Wourroon has quit IRC
02:00:59 *** fell has quit IRC
02:02:13 *** fell has joined #gnucash
02:02:14 *** ChanServ sets mode: +o fell
02:39:05 *** Wourroon has joined #gnucash
02:39:05 *** ChanServ sets mode: +v Wourroon
03:24:28 *** Gandalf has joined #gnucash
04:36:41 *** kyew has quit IRC
04:38:53 *** kyew has joined #gnucash
04:38:54 *** ChanServ sets mode: +v kyew
05:43:29 *** nick has joined #gnucash
06:00:58 *** field^Mop has joined #gnucash
06:04:01 *** field^Mop has quit IRC
06:12:51 *** gjanssens has joined #gnucash
06:12:51 *** ChanServ sets mode: +o gjanssens
07:23:48 *** nick has quit IRC
07:38:37 *** jmdaemon has quit IRC
08:01:06 *** field^Mop has joined #gnucash
08:16:57 *** chipxxx has joined #gnucash
08:51:33 *** fabior has joined #gnucash
09:12:46 *** fabior has quit IRC
09:20:35 *** fabior has joined #gnucash
09:24:24 <gjanssens> Just fyi, I tried to force-push the beta branch of gnucash-htdocs to bring it in line with current master (I planned to experiment for the ghelp2help PRs)
09:24:53 <gjanssens> That however didn't work well on the webserver, which uses git pull to update to newer commits.
09:25:13 <gjanssens> The result is currently the beta branch is in a merge conflict.
09:25:54 <gjanssens> I can't solve it myself as I don't have write permissions on the webserver (I can log in and look around though, which is how I figured out what happened).
09:26:15 <gjanssens> I have sent a mail to linas asking for assistance fixing this.
09:26:32 <gjanssens> Hopefully he will answer soon...
09:42:44 *** field^Mop has quit IRC
09:44:30 *** fabior has quit IRC
09:45:03 <Simon> git pull --rebase
09:46:08 <Simon> best to have the webserver use "git pull --ff-only" then it would refuse to continue instead of having a merge conflict
09:46:27 <Simon> or use git fetch + hard reset to always use whatever the remote branch is
09:47:26 <gjanssens> I had proposed to do the latter to linas :)
09:47:46 <gjanssens> I can't run any of these commands myself as I don't have write permissions.
09:57:47 *** field^Mop has joined #gnucash
10:10:21 *** fabior has joined #gnucash
10:13:49 *** field^Mop has quit IRC
10:16:45 *** fabior has quit IRC
10:56:26 *** fabior has joined #gnucash
11:20:54 *** fabior has quit IRC
11:31:06 *** NoobAlice has joined #gnucash
11:31:06 *** ChanServ sets mode: +v NoobAlice
12:00:51 *** chipxxx has quit IRC
13:51:05 *** field^Mop has joined #gnucash
14:01:05 *** field^Mop has quit IRC
14:14:39 *** jmdaemon has joined #gnucash
14:16:36 *** NoobAlice has quit IRC
14:17:42 *** NoobAlice has joined #gnucash
14:17:42 *** ChanServ sets mode: +v NoobAlice
14:51:15 *** gjanssens has quit IRC
14:52:08 *** NoobAlice has quit IRC
14:53:13 *** NoobAlice has joined #gnucash
14:53:13 *** ChanServ sets mode: +v NoobAlice
15:05:58 *** field^Mop has joined #gnucash
15:08:55 *** NoobAlice has quit IRC
15:08:59 *** field^Mop has quit IRC
15:11:02 *** NoobAlice has joined #gnucash
15:11:02 *** ChanServ sets mode: +v NoobAlice
15:17:58 *** jonasbits has joined #gnucash
15:31:25 <jralls> warlord, you have a shell account on www, right? Do you have sudo or write permission on the git repo?
15:36:34 *** jonasbits has quit IRC
15:49:20 *** jonasbits has joined #gnucash
16:53:22 <warlord> jralls, theoretically I have a shell account, but I do not believe I have sudo or write permission to the git repo
16:53:49 <jralls> Just like gjanssens then. Sigh.
17:16:08 *** Gandalf has quit IRC
17:26:34 *** jonasbits has quit IRC
18:10:23 *** jonasbits has joined #gnucash
18:15:54 <warlord> yeah
18:32:29 *** guak has joined #gnucash
18:35:17 *** jonp` has joined #gnucash
18:37:25 *** jonp has quit IRC
19:25:07 *** Wourroon has quit IRC
19:25:33 *** Wourroon has joined #gnucash
19:25:34 *** ChanServ sets mode: +v Wourroon
19:27:14 *** Unhammer has quit IRC
21:25:21 *** guak has quit IRC
22:43:12 *** CDB-Man has quit IRC