RE: [PEAR-DEV] Living with github ...

You should be able to do a "pull" from the original github repo, to your local copy, and in doing so, resolve any conflicts, if any. Then push the merged version back to your GitHub copy. -----Original Message----- From: Lester Caine [mailto:lester@lsces.co.uk] Sent: Monday, September 10, 2012 6:25 PM To: pear-dev@lists.php.net Subject: [PEAR-DEV] Living with github ... OK I've forked a copy of https://github.com/pear/pear-core at https://github.com/bitweaver/pear-core where I've incorporated the e_strict changes needed to get bitweaver working. Now I need to sync the bitweaver version with the latest few commits in core but I'm not sure where to start? I'm normally hosting my 'master' here rather than at github so it may be I should have done this differently anyway? -- Lester Caine - G8HFL ----------------------------- Contact - http://lsces.co.uk/wiki/?page=contact L.S.Caine Electronic Services - http://lsces.co.uk EnquirySolve - http://enquirysolve.com/ Model Engineers Digital Workshop - http://medw.co.uk Rainbow Digital Media - http://rainbowdigitalmedia.co.uk -- PEAR Development Mailing List (http://pear.php.net/) To unsubscribe, visit: http://www.php.net/unsub.php