git - Removing files from repository while merging makes them disappear -


here test repo demonstrating problem: https://bitbucket.org/vektor330/bugtest

the sequence of events this:

  1. add initial commit.
  2. person adds conflict , source develop.
  3. person b adds conflict master.
  4. person b merges develop master, resolving conflict on conflict using "mine" strategy, , removing source repository. empty commit, can commited , pushed remote.

the result is: source has disappeared repository. appeared in 7dfa23e, there log of appearing in repo, , quietly disappeared in 5080a24, without single trace.

i expect commit 5080a24 show "source removed", wrong git or expectation?

why wouldn't show "content of merge commit".

you can visualize content of merge commit selecting merge commit , each of 2 parents in turn.

when select (in sourcetree) 1 develop branch (in addition of merge commit), see files_to_lose/source have been removed:

diff

why commit not show missing file?

because in case of merge commit, there 2 parents compare against. sourcetree doesn't offer diff against 2 parents.

github mac or windows does, when select only merge commit:

github windows

in short, isn't git, git gui using.


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

How to provide Authorization & Authentication using Asp.net, C#? -

Image
i have asp.net application in c#. i have provide page authorization specific user/usergroup. i have created 2 tables in database: 1) pagename 2)permissions[insert, update, view, delete] but i'm unable match tables , permissions assigning... can 1 please me, how created tables in database , how coding. please me. you can below explanation. configure access specific file , folder, set forms-based authentication. request page in application redirected logon.aspx automatically. in web.config file, type or paste following code. this code grants users access default1.aspx page , subdir1 folder . <configuration> <system.web> <authentication mode="forms" > <forms loginurl="login.aspx" name=".aspnetauth" protection="none" path="/" timeout="20" > </forms> </authentication> <!-- section denies access files in...
Read more