![]() I also set up a scenario in which git rebase might have been an option, but saw the same merge behavior. (The 'recursive' strategy ".is the default merge strategy when pulling or merging one branch." per the manual.) Go to main branch and pull the changes, type: git pull. Press 'Push Origin' button on the main screen. Press 'Fetch Origin' button on the main screen. Change Back 'Primary Remote Repository' to my fork repository. Using the "Update from." button, however, resulted in the following reflog entry: : merge /master: Merge made by the 'recursive' strategy.Īnd a merge commit in the log: Merge remote-tracking branch '/master' Making a git rebase through GitHub Desktop: 1.-. Press 'Pull Origin' button on the main screen. By default, git merge would have produced a fast-forward merge (without a merge commit). This set up a scenario in which the branch checked out, master in my local repository, was one commit behind master in the main remote repository. For example, editing the Forums article may result in the branch being called update-forums. After this fetch, the "Update from." button lit up. Finally, I used git fetch (, hereafter) to bring the single commit to my local machine. Next, I committed a small change to the (original) main remote repository. Then, I cloned the repository from my GitHub account to my local machine. ![]() I reached the conclusion in the following way:įirst, I forked a repository that I control to my GitHub account. Or something nearly identical with the "Compare" branch set to in the GitHub Desktop GUI. So we still need to upload these changes to our master branch on our local computer to our GitHub repository on the GitHub server, which for me is danielb987. I concluded that the "Update from." button dispatched git merge -no-ff -m "Merge " The git commands underlying the buttons in GitHub Desktop are not well-documented, so I investigated a while back.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |