[00:22:51] *** Joins: JuanDaugherty (~juan@98.4.124.117) [04:41:07] inariksit: thanks, this helps a lot [06:53:52] *** Quits: proteusguy (~proteus-g@2405:9800:bc10:1ca:28db:4234:4232:6949) (Remote host closed the connection) [07:26:35] *** Joins: proteusguy (~proteus-g@180.183.115.189) [07:37:05] *** Quits: drbean (~drbean@124.219.83.41) (Ping timeout: 240 seconds) [07:37:34] *** Joins: drbean (~drbean@124.219.83.42) [08:14:22] *** Quits: drbean (~drbean@124.219.83.42) (Ping timeout: 260 seconds) [08:14:35] *** Joins: drbean (~drbean@124.219.82.41) [08:32:29] *** Quits: JuanDaugherty (~juan@98.4.124.117) (Quit: Ex-Chat) [09:03:22] *** Quits: drbean (~drbean@124.219.82.41) (Ping timeout: 260 seconds) [09:06:05] *** Joins: drbean (~drbean@124.219.82.41) [09:17:21] *** Quits: drbean (~drbean@124.219.82.41) (Ping timeout: 240 seconds) [09:21:14] *** Joins: drbean (~drbean@124.219.82.41) [10:26:03] ayberkt: okay [10:26:26] so now that I'm working on my own estonian branch, I'll just merge it occasionally to the master, and then that branch will also have tons of merge commits [10:26:47] *** Quits: drbean (~drbean@124.219.82.41) (Ping timeout: 260 seconds) [10:26:48] or is there some way that you would recommend otherwise? [10:27:42] *** Joins: drbean (~drbean@124.219.82.42) [10:53:01] *** Quits: drbean (~drbean@124.219.82.42) (Ping timeout: 240 seconds) [10:54:45] *** Joins: drbean (~drbean@124.219.82.41) [11:07:23] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [11:25:12] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:26:12] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [11:35:43] *** Quits: drbean (~drbean@124.219.82.41) (Ping timeout: 248 seconds) [11:36:26] *** Joins: drbean (~drbean@124.219.82.41) [11:42:40] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:44:10] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [11:44:34] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:49:23] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [11:50:26] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:51:17] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [11:52:08] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:53:19] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [11:53:43] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:54:51] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [11:55:15] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:56:14] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [11:56:37] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:57:17] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [11:58:09] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:59:10] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [11:59:39] *** Joins: proteusguy (~proteus-g@180.183.115.189) [11:59:48] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:01:10] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:02:15] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [12:02:40] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:02:55] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:04:07] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:05:16] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [12:05:45] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:11:47] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:13:15] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:15:33] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:16:59] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:17:14] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:18:36] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:19:17] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:35:24] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:36:06] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:37:04] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:38:12] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [12:38:37] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:41:00] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [12:41:27] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:46:18] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [12:47:20] *** Joins: proteusguy (~proteus-g@180.183.115.189) [12:48:47] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Excess Flood) [13:06:52] *** Joins: proteusguy (~proteus-g@180.183.115.189) [13:10:03] *** Quits: proteusguy (~proteus-g@180.183.115.189) (Read error: Connection reset by peer) [13:27:35] *** Joins: venicecat (caa61422@gateway/web/freenode/ip.202.166.20.34) [13:28:14] of course inari! Thanks for the improvements to the grammar. [13:28:28] i hope to make it work [13:29:13] *** Joins: koom (~sirdancea@109.107.211.244) [13:51:55] *** Quits: venicecat (caa61422@gateway/web/freenode/ip.202.166.20.34) (Ping timeout: 260 seconds) [14:28:12] *** Quits: drbean (~drbean@124.219.82.41) (Ping timeout: 240 seconds) [14:28:37] *** Joins: drbean (~drbean@124.219.82.41) [14:34:55] *** Quits: drbean (~drbean@124.219.82.41) (Ping timeout: 246 seconds) [14:35:38] *** Joins: drbean (~drbean@124.219.82.41) [14:44:00] *** Joins: vx (~androirc@143.0.176.54) [14:51:08] *** Quits: vx (~androirc@143.0.176.54) (Quit: AndroIRC - Android IRC Client ( http://www.androirc.com )) [15:43:58] *** Joins: koo5 (~koom@109.107.211.244) [15:50:53] *** Joins: proteusguy (~proteus-g@2405:9800:bc10:1ca:a5c1:6eaf:5749:9907) [16:27:35] *** Quits: koo5 (~koom@109.107.211.244) (Remote host closed the connection) [16:44:33] *** Joins: JuanDaugherty (~juan@98.4.124.117) [19:07:52] *** Quits: JuanDaugherty (~juan@98.4.124.117) (Quit: Ex-Chat) [20:00:01] *** Quits: koom (~sirdancea@109.107.211.244) (Ping timeout: 240 seconds) [22:25:54] inariksit: how often do you need to merge from estonian? [22:27:13] I still haven't set up some kind of notification system for IRC, I should do that some time [22:49:32] It's okay to have merge commits for every time you merge from your feature branch [22:50:05] But now people working on other branches won't have a merge commit for _every commit on master_ [22:50:31] Because, for example, to keep my branch merge-able with master I kept pulling from upstream and that resulted in a merge commit every time [22:51:01] Also if you really don't like merge commits (there are a lot of people who don't), you can also do rebase merges [22:51:18] https://www.atlassian.com/git/tutorials/merging-vs-rebasing