The only branch shown is the "master" branch ![]() Went back onto github web, told it to open in the github desktop, and did the clone.I deleted the whole local repository directory from disk, selected it in the github desktop and told it to "Remove it" when it says it couldn't find it.Made sure github desktop updated to version 0.5.7.See the final Thanks so much for looking into it. If I click on the "Detached HEAD" and select master, I am basically reset to where I started.If I push the "Publish branch" it does nothing.Note that the "Detached HEAD" changed to some new changeset hash, and the "Publish branch" button is still there (i.e., no "Push"). ![]() Now, I choose to "Commit to master" and you can see the next screenshot.Now, I go to the file and resolve the conflict, and save the file I want to push to the remote See the following screenshot before the Commit.However, if I hit that dropdown it only shows the "Default branch" and I can't go back to that "Detached HEAD" if I select it. Note the "Detached HEAD, On ee8537c" in the typical branch dropdown. The screenshot immediately following me closing that dialog is the following. Please resolve the conflicts before continuing" It correctly detects the conflict, and says "We found some conflicts while trying to rebase.Did a "pull origin" in the github desktop.I modified and committed a README on the github website, as well as on my local machine (same line of the README to ensure a conflict).Went back onto github and opened the repository in the github desktop, and did the clone.I deleted the whole local repository directory from disk, selected it in the github desktop and told it to remove it when it says it couldn't find it.The remote repository only has the master branch.Absolutely no funny stuff intended (though maybe bugs in the desktop threw it into a weird state?) I downloaded the desktop from the link: and the version number says 0.5.5 No customization, nothing ever done on the command-line, only one branch, etc. This is setup in about as vanilla a repository as you can imagine. You commit using the Thanks for the response, and it is a good sign that you are as confused as I was!.You resolve these conflicts, either in your editor by manually removing the conflict markers or by invoking git mergetool from the command line.The clients shows a dialog message saying that you now have a merge conflict and indicates which files in the file list has conflicts.Pull from a remote or merge from a local branch which will cause a merge conflict.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 |