Re: Living with github ...
| From: | Lester Caine | Date: | Mon, 10 Sep 2012 16:48:37 +0000 |
| Subject: | Re: Living with github ... | ||
| References: | 1 2 | Groups: | php.pear.dev |
| Request: | Send a blank email to pear-dev+get-55047@lists.php.net to get a copy of this message | ||
Васил Рангелов wrote:
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. AH - I was thinking it had to be done via github, but that explains why TortoiseHg lists pear/pear-core as a Related path :)Except while it's synced nicely locally I can't get bitweaver/pear-core to process the push of the merged copy :( -- 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