Git merges all the time -


a programmer in team has strange issue particular git repository.

he user making changes repo, yet, everytime pushes, git make merge commit message rather actual commit message!

it's hard explain picture better suited: enter image description here

at point started doing 'playmakertest' thing , never recovered doing that. every single commit makes , pushes ends being merge. after cleanly checking out, rebasing latest commit, moving master , getting rid of other branches.

anyone got idea why happening? i'm on brink of creating new repo...

i don't know if you're going delete question (as suggested in comments above), note 1 thing:

git push cannot create merge.1

when use git push, have git call other git (e.g., via ssh), after 2 git repositories have little conversation discuss objects yours has theirs doesn't, , objects you'd them set of references point-to.

for instance, in case (or more precisely programmer in team) might call server git instance , "please change branch branch point commit 1234567...". in order server that, server has have commit 1234567... git may package object other needed objects, , ship over, first.

the server-side git does not merging during process, accepts whatever objects needed first, takes requests "set refs/heads/branch 1234567...". requests run through permission-checking (pre-receive , update hooks), typically things refuse non-fast-forward updates, or when using fancier systems gitolite, check whether remote user has permission create, delete, or update particular branch.2 if permissions checks allow it, server-side git process sets requested references (usually branch-names, tags; there note references , such).

each of these merges, then, coming user (not server) side, before git push step. noted in comments above this due user repeatedly amending existing-but-pushed commit, copies commit new id. pushing new id not fast-forward operation , default refused; happen, user presumably doing additional merges.

1well, not itself, anyway. using hooks mentioned above, it's possible set server such when receives push, saves new commit(s), rejects push itself, , runs additional separate git commands create merges using saved-but-rejected commit(s). that's quite twisted mode of operation, , not people or should do. (also, it's not precisely push creating merge here, it's push triggering other script, , other script creating merge.)


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