![]() ![]() With the default behavior of merge pulls I believe your story becomes a lot easier. Is it possible that you have some custom configuration in your global config that forces pull to use rebase? In-progress rebases is not something that we've had time to support in the client thus far. The client shouldn't put you into a rebase when you pull. Hey want to do much more to support merge conflicts in the UI and we welcome any feedback as we figure this out, see #71 for one example. How do I do it in the UI (or even the commandline!) with the rebase and Detached HEAD? FOr example, the following DID NOT WORK: 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 |