![]() I have attached the log that includes all my attempts to fix this problem. ![]() Proposed solution The UI can be changed to show the whole stack of stashes. After undoing that small commit, I regained the ability to commit my once-conflicted files. Describe the feature or problem you’d like to solve Github Desktop only supports a single stash per branch. ![]() 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. Clicked New Branch in GitHub Desktop, created the feature branch Clicked Bring my changes to the new branch not Stash changes on current branch New. Whatever widget is controlling the ! triangle vs checkmark is able to succesfully deduce when I have resolved the conflict. Whether youre new to Git or a seasoned user, GitHub Desktop simplifies your development workflow. 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 Commit List - Working Directory Changes - Side by Side Diff - Repository Manager.Just choose the second option, to bring the changes to the new branch. Manually resolve the conflict with a text editor, NOT by using any shortcuts included in Github Desktop All you need to do is switch to the new branch in GitHub Desktop, and it will prompt you to leave your changes on the current branch (which will be stashed), or to bring your changes with you to the new branch.Steps to reproduce the behavior Go to Current repository Select changes I want to discard right-mouse-click on the ch. Restore the stash from step 4, should see a ! triangle next to the file name indicating that there is a confilct Describe the bug I cannot discard any change through Github for desktop anymore Version & OS Version 2.5.3. ![]()
0 Comments
Leave a Reply. |
Details
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |