The simplest way (based on the experience with Efi's change) is to add the Github site as a remote, merge locally with master, then push. Steven
On Wednesday, May 20, 2015, Till Westmann <[email protected]> wrote: > Nice. Thanks! > > > Preston, Steven, is there a particularly easy way to merge changes that > are available on GitHub into our repository? > > Thanks, > Till > > On 20 May 2015, at 13:51, Shivani Mall wrote: > > This Week: >> >> 1)XMark Documentation Completed which can be found here: >> >> https://github.com/shivani1494/vxquery/commit/dd7cddd49a471cd5c11588c262037b0276348611 >> >> 2)Updating Code to show Logical and Optimized Query Plans for XTest since >> this option is currently avaiable only for VXQuery >> >> ᐧ >> >> On Wed, May 20, 2015 at 1:51 PM, Shivani Mall <[email protected]> wrote: >> >> Last Week: >>> >>> 1) Completing XMark Documentation. >>> >>> >>> ᐧ >>> >>> On Mon, May 4, 2015 at 4:51 PM, Shivani Mall <[email protected]> wrote: >>> >>> Last week: >>>> >>>> 1) Understood XQuery Data Model, multiple wrappers around XML document, >>>> SequencePointable, the need for builders and a little bit of data flow >>>> and >>>> operators. Thanks to Preston for great explanations! >>>> >>>> 2)Documentation: SequencePointable structure, byte array break down of a >>>> basic XML Doc. >>>> >>>> >>>> ᐧ >>>> >>>> >>> >>>
