git - How do you resolve a GitHub merge conflict that appears to have everything merged in? -


the repo contributing uses forking/rebasing pattern on github. feel i'm missing concept here did not result expecting. currently, pr says can't merge because there conflict, however, there appears no commits in dev branch don't exist in mine.

the steps took end here follows:

  1. created fork of repo
  2. created branch feature based on dev
  3. made changes, committed files
  4. created pull request

at point, got following error appveyor message:

this pull request contains merge conflicts must resolved.

the recommendation "pull latest dev, rebase pr on it."

so, branch did following 2 commands update upstream (aspnet) , rebase branch off of dev:

git fetch aspnet git rebase aspnet/dev

i expected branch contain of commits aspnet/dev, commits. instead, changes seem appear twice, other commit has appears in between them (so...there nothing left merge), have no conflicts locally , i've landed in following state:

graph of commits

now, changes aren't huge - limited single file - , nuke prs , start over, want understand did wrong , "correct" way have been it.

this pr in question: #24 refactored clearing of secrets file

is there way fix have pr can merge?

is there better flow follow rebase works correctly?

okay, there couple of things had do.

first, aspnet/dev , forked dev not in sync. them sync'd did following:

git fetch aspnet git checkout dev git rebase aspnet/dev git push

next switched branch , cleaned things up, followed forced push repo/pr:

git checkout misterjames/clear-corrupt-secrets git rebase -i dev git push -f

i squashed commits single commit during interactive rebase.

thanks @david-paquette tips on solving this.


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