using a smaller project as a git submodule in several other projects - can't make it work -


i've seen question crop more once in 1 form or around here, made me choose route. have smallish project (web stuff) has own gruntfile , git repository , under active development. use result of development in several other projects, is, don't want or need gruntfile or sass files etc. however, if there's update in shared project, want able pull , merge updates files in current project. want make modifications these files adapt them current project's needs.

the way understand is, should make git submodule in other project want have these files. must new git, far i've been using few personal projects - , loving -, nothing collaborative (so no pulling , merging yet), , feel still don't have grasp on it.

anyway added shared project (let's call sub) submodule in project i'm working on (let's call a). sub exists folder in a, , git status lists folder modified. doing git add sub/ not change this. , doing git merge sub/ nets me merge: sub/ - not can merge. ?? how updated files sub a? or going wrong way? found subtree merge strategy on somewhere, maybe more suitable?

i'm using git v2.1.4, afaik there have been changes git submodule in v 2.10.1 - not sure if problem.

so first, a , sub 2 different repos own life.

from point of view of a, sub reference/link specific commit in sub.
when change in sub, need commit these changes: 

$ cd sub/ $ git commit -a -m "improve sub framework loading times" [master f78dc91] improve sub framework loading times"  10 files changed, 228 insertions(+), 28 deletions(-) $ git push

so you've added new commit (f78dc91) sub, can go a , enter:

$ cd .. $ git status on branch master branch up-to-date 'origin/master'. changes not staged commit:   (use "git add <file>..." update committed)   (use "git checkout -- <file>..." discard changes in working directory)      modified:   sub (new commits)

the need git add these sub changes (i.e. reference new commit f78dc91): 

$ git add sub on branch master branch up-to-date 'origin/master'. changes committed:   (use "git reset head <file>..." unstage)      modified:   sub

and commit: 

$ git commit -m "a uses new version of sub improving loading times." $ git push

so see, committing , pushing changes in sub, , integrating these changes in a 2 independent actions need perform if want a changes.

other comments

git merge sub/

you can merge references, means commits, branches , tags (and references of a repo) command not make sense. (you can't merge file or directory)


-

Comments

Post a Comment

Popular posts from this blog

python - How to insert QWidgets in the middle of a Layout? -

Image
i'm using qt framework build graphical user interface. use qgridlayout position qwidgets neatly. gui looks this: my application regularly adds new widgets gui @ runtime. these new widgets not added @ end of qlayout, somewhere in middle. the procedure bit cumbersome. applied on figure above, need take out widg_c , widg_d , ... qgridlayout. next, add widg_x and widg_y , , put other widgets again. how remove widgets qgridlayout: for in reversed(range(mygridlayout.count())): self.itemat(i).widget().setparent(none) ### as long you're dealing small amount of widgets, procedure not disaster. in application display lot of small widgets - perhaps 50 or more! application freezes second while procedure ongoing, annoying user. there way insert widgets somewhere in qlayout, without need take out other widgets? edit: apparently solution qvboxlayout simple. use function insertwidget(..) instead of addwidget(..) . docs can found link: http://doc.qt.io/qt-5/qboxlayou
Read more

python - serve multiple gunicorn django instances under nginx ubuntu -

i need serve 2 webs apps (django) on gunicorn under different domain names using nginx on ubuntu. started using tutorial: https://www.digitalocean.com/community/tutorials/how-to-set-up-django-with-postgres-nginx-and-gunicorn-on-ubuntu-16-04 it worked fine 1 using that. tried same thing second gives me 502 gateway second domain. tried following tutorial: http://michal.karzynski.pl/blog/2013/10/29/serving-multiple-django-applications-with-nginx-gunicorn-supervisor/ i'm @ part run gunicorn start script: sudo bin/gunicorn_start i response: starting webuildblack root traceback (most recent call last): file "/home/devin/webuildblack/bin/gunicorn", line 7, in <module> gunicorn.app.wsgiapp import run importerror: no module named 'gunicorn.app'; 'gunicorn' not package you have named program gunicorn.py gunicorn -package. rename file , remove gunicorn.pyc file.
Read more

module - Prestashop displayPaymentReturn hook url -

i new prestashop developer , trying create paymentmodule. have got show payment method can not proceed purchase because not know hot works. does know should redirect run hooddisplaypaymentreturn method? i happy if explain me complete navigation map make purchase. anyway, can find relation between hooks , pages? when have new module payment rely on simplest provided prestashop: bankwire. inside can find 3 hooks. hookpayment: public function hookpayment($params) { if (!$this->active) return; if (!$this->checkcurrency($params['cart'])) return; $this->smarty->assign(array( 'this_path' => $this->_path, 'this_path_bw' => $this->_path, 'this_path_ssl' => tools::getshopdomainssl(true, true).__ps_base_uri__.'modules/'.$this->name.'/' )); return $this->display(__file__, 'payment.tpl'); } hookdisplaypaymenteu: public fun
Read more