[08:19:22] *** Quits: proteusguy (~proteus-g@184.22.243.75) (Remote host closed the connection) [08:47:08] *** Joins: proteusguy (~proteus-g@180.183.134.32) [10:22:49] *** Joins: koom (~sirdancea@109.107.211.244) [12:43:09] *** Quits: proteusguy (~proteus-g@180.183.134.32) (Remote host closed the connection) [13:42:30] *** Joins: proteusguy (~proteus-g@180.183.48.154) [13:59:21] *** Quits: proteusguy (~proteus-g@180.183.48.154) (Remote host closed the connection) [15:37:17] *** Joins: proteusguy (~proteus-g@184.22.240.66) [16:07:55] ayberkt, mbrock, or someone who has opinions on github: I made a pull request of 16 commits in my branch, and when I accepted it into the master, I squashed all those commits into one commit [16:08:16] I also merged my branch with the master, to get the latest updates elsewhere [16:09:13] now when I look at my branch, github shows "This branch is 17 commits ahead, 2 commits behind master. " [16:10:06] my question is: if I continue developing in this branch and make a pull request when I have again something more substantial, will it try to merge those 16 original commits as well? (17th is the merge from master) [16:12:59] the merge from my branch shows here just fine, https://github.com/GrammaticalFramework/GF/commits/master b025c17 [17:14:53] Hey, I'm not at computer but it sounds to me like you should reset your branch to point to the current master. So like "git checkout b && git reset --hard origin/b" for example. Because the squashing means that the commits on master are different from the ones on your branch [19:02:09] *** Quits: koom (~sirdancea@109.107.211.244) (Ping timeout: 248 seconds) [19:17:36] *** Quits: ayberkt (~root@174.138.71.241) (Remote host closed the connection) [19:37:57] *** Joins: ayberkt (~root@174.138.71.241) [20:23:09] *** Joins: JuanDaugherty (~juan@98.4.124.117)