Just wanted to quickly chime in here—Lorin, your sizeable merge reverted one of my bug fixes (CB-2732). Not a huge deal, and a re-fix is on the way, but try to be extra careful when doing merges like that. :)
On Tue, Apr 2, 2013 at 8:33 PM, Andrew Grieve <agri...@chromium.org> wrote: > Sounds good. Cool graph Jesse! > > > > On Tue, Apr 2, 2013 at 4:49 PM, Lorin Beer <lorin.beer....@gmail.com> > wrote: > > > hmm, likely a merge. A local commit before pulling in upstream changes, > > then doing a merge seems to be the cause. > > > > > > On Tue, Apr 2, 2013 at 1:07 PM, Jesse <purplecabb...@gmail.com> wrote: > > > >> merging most likely, set up a filter. > >> I commit to master, checkout 2.6.x, pull master, push 2.6.x because I > >> want all the work I am doing in 2.6.0 > >> > >> https://github.com/purplecabbage/cordova-wp8/network > >> Looks good to me ... > >> > >> @purplecabbage > >> risingj.com > >> > >> > >> On Tue, Apr 2, 2013 at 12:52 PM, Andrew Grieve <agri...@chromium.org > >wrote: > >> > >>> There's quite a bit of email spam from both of you and I wasn't sure > >>> what caused it? Do you know? > >>> > >>> rebasing? merging? branching? > >>> > >>> Hard to figure out what actually has changed when these happen, so I'd > >>> like to figure out what causes them. I did one recently where I > rebased a > >>> remote feature branch. > >>> > >> > >> > > >
