Using Git to update underlying library but keep changes -


i have case history of library upon made work, , of work have diverged. time after branched off of original branch contains library 1.0, library's developer released update, need incorporate end result, keeping changes made on top of that.

there answer similar question here. however, many experienced git users not recommend rebasing commits public, , reason: history re-written. attached previous commits lost. keeping pull requests "book-keeping" become useless. so, what best approach if want achieve similar result, keep history sane, and, more importantly, have local repositories of collaborators consistent?

i expect developer of underlying library make new releases once in while, , process needs repeated every time, drawbacks. graph this:

product ------p1--p2--p3--p4'--p5--p6'              /           /        / library ---l1----------l2-------l3

anyone?

use git merge instead of git rebase. create "merge commit" rather re-writing history.

for example:

git fetch git merge library/master

Comments

Post a Comment

Popular posts from this blog

toolbar - How to add link to user registration inside toobar in admin joomla 3 custom component -

im trying write component admin side , need add user creation. dont want duplicate existing codes add link. know how add task not simple link toolbar. thx help. if wanting button opens new user screen can try in component: $bar = jtoolbar::getinstance('toolbar'); $bar->appendbutton('link', 'users', 'new user','index.php?option=com_users&task=user.add'); you need add view.html.php file wherever you're creating toolbar. is need?
Read more

linux - disk space limitation when creating war file -

i have 1 gb disk space limitation hosting app , have used 700mb of it. however want create war file directory big (around 600mb) using command : jar -cvf root.war folderpath that's why encounter quota limitation , can't following. i'm looking way delete folder content when it's applying archive conserve disk space take note can't install zip tool in ssh shell ~ the code works on test directories, test first anyway, deletes files. it's not efficient. assumptions: 300mb free space, in destructively compress 600mb folderpath directory. none of files big -- if file in folderpath 300mb or larger, fail. notes: if ' $out ' file exists, nothing. first find pipes file list while , if ' $out ' doesn't exist in loop, create it, don't update -- if does exist, update it. each pass adds 1 more file, deletes unless file directory. after loop finishes delete empty directories too. unset u ; in=folderpath ; out=roo...
Read more