web - Directory mapping and merging in git -


i have online store running oscommerce , use git manage development, official release uses git.

i go through changelog , read each change each file, type said change, , commit. can imagine takes forever , increases chance of me typing , commiting wrong.

i'd easier way manage updates/merging official git repo without having hand edit each file , commit. know git has merge command run 2 obstacles when thinking problem.

  1. the file structure isn't same.

    all files located in shop/ , default catalog/

  2. i want merge changed files official "catalog/" directory files in "shop/" directory.

    i rather not download/redownload every readme, changelog, , other removed files every time updates official repo

how can update/merge files without retyping every change in manually taking account above 2 problems? what's proper workflow situation?


Comments

Post a Comment

Popular posts from this blog

twig - Using Twigbridge in a Laravel 5.1 Package -

i'm trying create laravel 5.1 package uses twigbridge instead of .php views. can normal .php views display fine, when try make use of .twig templates i'm met error. possible use twigbridge templates when creating views laravel package or pretty stuck blade , php ? edit 1: loading twig template without extending works. it's when start using {% extends 'file' %} error comes out. i error error loading /virtual/laravel/packages/username/mypackage/src/views/sample.twig: template "templates.master" not defined () in "/virtual/laravel/packages/username/mypackage/src/views/sample.twig" @ line 1. my folders username |_ mypackage |_ src |_ controllers - samplecontroller.php |_ views |_ templates - master.twig - sample.twig twig template sample.twig {% extends 'templates.master' %} {% block content %} {{ parent() ...
Read more

Kivy: Swiping (Carousel & ScreenManager) -

i have 2 screens in screenmanager both contains number of buttons in scrollview. idea 1 steps forward (right) clicking button. , step (left) swiping back. trying add carousel implement 1 swipe on second page. have tried: self.root = screenmanager(id = 'screen_manager') main_screen = screen(name = 'main_screen') scroller = scroller() button_text = ['teach', 'move', 'b3', 'b4', 'b5', 'b6', 'b7', 'b8'] text in button_text: scroller.view.add_widget(field(name=text, direction='left', current='teach')) main_screen.add_widget(scroller) self.root.add_widget(main_screen) carousel = carousel(direction='left', id='carousel') teach = screen(name = 'teach') scroller2 = scroller() button_text = ['vocab', 'drills'] text in button_text: scroller2.view.add_widget(field(name=text, direction='right', current='main_screen')) carousel.add_...
Read more

jdbc - Not able to establish database connection in eclipse -

i want make new database connection (db2) in eclipse purpose of using jpa. in jpa perspective, in data source explorer view, when try create new db connection, receive following logs when try ping server. org.eclipse.datatools.connectivity.exceptions.dbnotstartexception: no start database command issued. errorcode = -4499, sqlstate = 08001. @ org.eclipse.datatools.enablement.ibm.db2.internal.luw.jdbcluwjdbcconnection.getconnectexception(jdbcluwjdbcconnection.java:74) @ org.eclipse.datatools.connectivity.ui.pingjob.gettestconnectionexception(pingjob.java:81) @ org.eclipse.datatools.connectivity.ui.pingjob.run(pingjob.java:63) @ org.eclipse.core.internal.jobs.worker.run(worker.java:54) caused by: com.ibm.db2.jcc.am.ro: [jcc][t4][2043][11550][4.8.87] exception java.net.connectexception: error opening socket server example.example.com/51.37.93.117 on port 50,000 message: connection timed out: connect. errorcode=-4499, sqlstate=08001 @ com.ibm.db2.jcc.am.gd.a(gd.j...
Read more