Or, even easier: lets say I just want to completely reset to the remote repository and then make the changes. What now in the UI? (I can't even figure it out with a combination of the UI and the commandline). Lets say I go and make the local modifications to resolve the conflict. You are currently rebasing branch 'master' on '30ae50d' At this point, if you run git status on the commandline, it says something like: On the Pull, it "Detached HEAD" with some changeset. VersionĬreate a typical conflict with a local change and a remote change Maybe this is because I don't understand the state that it puts the local repository in, but I want an idiot proof way to tell my (relatively non-technical) collaborators how to deal with conflicts. How do you envision using the GUI to resolve conflicts? I can't figure it out, even combining the UI with the command line. This is a general comment on the UI in GitHub Desktop.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |