This is kind of an edge case, but for completeness's sake it might make sense to implement this. I have attached the log that includes all my attempts to fix this problem. After having changed a few files and running git stash the changes disappear in GitHub Desktop (as expected), but the stash is not shown at the bottom (like usual, when you're switching branches). After undoing that small commit, I regained the ability to commit my once-conflicted files. I am still unable to stash/commit my changes.Įdit: after restarting the app several times and resetting my changes (copy all modified files to a different location, delete all changes on branch, copy the modified files back onto the branch), I have regained the ability to stash my changes but the commit button still does not work.Įdit2: after deleting the local copy of the branch & redownloading from origin, I still am unable to commit my changes.Įdit3: after making a small commit on a file unrelated to those I was stashing & conflicting before, I was still unable to commit my changes on the once-conflicted files. However, that verdict hasn't been passed to whatever is controlling the other menus. Whatever widget is controlling the ! triangle vs checkmark is able to succesfully deduce when I have resolved the conflict. I should be prevented from using "stash all changes" or "commit" for as long as there is a conflict, and I should be able to regain use of the "stash all changes"/"commit" functions once the system detects that the conflict is gone. Notice that the menu item Branch > Stash all changes is now greyed out and disabled, and the "commit" button doesn't work either.Notice that the ! triangle has been replaced with a checkmark.The files with a checkmark will be included in your next commit. git stash show to see what n is in the below commands. git stash list to list your stashed changes. To stage or unstage individual files, use the checkbox next to each file name. git config alias.unstash stash apply -index will allow you to use git unstash and have it do what you think it should do. Manually resolve the conflict with a text editor, NOT by using any shortcuts included in Github Desktop To stage or unstage all of your files in GitHub Desktop, use the top checkbox in the left pane.Click View Stash, and then click Restore. Restore the stash from step 4, should see a ! triangle next to the file name indicating that there is a confilct And when you come back to GitHub Desktop, you should see this display, View your stashed changes.Use drag-and-drop to squash the commits from 2 and 6.Go back to Desktop and try to restore the stash in the branch that was affected. Cannot stash changes after a conflict is resolved Version & OSĢ.9.0 (圆4), Windows 10 64 bit. Go to branch Click on stashed changes Click on restore stash.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |