git merge subdirectory with another repository -

-

i have git repository (named x) develop larger project. want use code git repository (named y) , include in repo x under x/a/b.

i want make changes x/a/b , commit own repository (x). possible copying code repo y x/a/b. want merge changes y x/a/b. how that?

finally, achieved desired result git subtree. can commit changes of x/a/b repository x, pull y.

this blog entry explains steps quick.


Comments

Post a Comment

Popular posts from this blog

html - jquery - p element wont show after I hid it -

-
im trying build website , ive ran problem. got 4 pictures , whenever want click on picture, want show text. wont show, did link console log , shows working. can me this? thanks in advance! css <img class ="porfoto" title="tekstroy" id ="roy" src="img/roy.png"> <img class ="porfoto" title="tekstkinmen" id ="kinmen" src="img/kinmen.png"> <img class ="porfoto" title="tekstboris" id ="boris" src="img/boris.png"> <img class ="porfoto" title="tekstelse" id ="else" src="img/else.png"> <p id="tekstroy">hallo </p> <p id="tekstkinmen">hallo2<p> <p id="tekstboris">hallo3</p> <p id="tekstelse">hallo4</p> js $("#tekstroy").hide(); $("#tekstkinmen").hide(); $("#tekstboris").hi...
Read more

python - BeautifulSoup: How to get the nearest tag -

-
i have xml file following data <year>2013</year> <yousavespend>2500</yousavespend> <yourmpgvehicle> <avgmpg>32.261695541</avgmpg> <citypercent>43</citypercent> <highwaypercent>57</highwaypercent> </yourmpgvehicle> <year>2013</year> <yousavespend>3000</yousavespend> <yourmpgvehicle> <avgmpg>33.383275416</avgmpg> <citypercent>49</citypercent> <highwaypercent>51</highwaypercent> </yourmpgvehicle> <year>2012</year> <yousavespend>2500</yousavespend> <yourmpgvehicle> <avgmpg>36.210640188</avgmpg> <citypercent>32</citypercent> <highwaypercent>68</highwaypercent> </yourmpgvehicle> i want use beautifulsoup return list of avgmpg year 2013? how can that? my current effort has been: for item in soupedcaravgmpgpage.findall('year'): listofyears.append(''...
Read more

php - Return Last Insert ID with PDO -

-
i have class , extend return id of last inserted row keep getting error: fatal error: call undefined method pdostatement :: lastinsertid () on line 49 my code: class db { public static $instance = null; private $_pdo = null, $_query = null, $_error = false, $_results = null, $_count = 0, $_lastid = 0; private function __construct() { try { $this->_pdo = new pdo('mysql:host=' . config::get('mysql/host'). '; dbname=' . config::get('mysql/db') . '; charset=utf8', config::get('mysql/username'), config::get('mysql/password') ); } catch(pdoexeption $e) { die($e->getmessage()); } } public static function getinstance() { if(!isset(self::$instance)) { self::$instance = new db(); } return self::$instance; } public function query($sql, $...
Read more