github - Git: Pulling and merging branch into Master -


so far have used git individually , first time using team. facing issue: there master repo contains 2 branches; dev1 , dev2. have been assigned review code of dev1 , merge master.

now in order view code or running want set branch on local machine. how pull of branch data first time have folders on machine , how later pull changes branch.

later how merge branch dev1 master?

thanks

if not have clone of remote repo:

git clone <remote repo url github> cd <repo>

fetch remote branches remote repo:

git fetch origin

checkout remote branch 'dev1':

git checkout dev1

review , run code see fit.

if have privileges (on github) push 'origin:master' should able merge 'master' 'dev1' , push updated 'master':

git checkout master git merge dev1 git push origin master

if not have privileges update remote 'origin:master' can issue pull-request (on github).


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