![]() Maybe I'm doing something wrong, or I miss something. > In GitHub Desktop, it just requires to click on "Sync" button (if I understand well).īut after that, instead of my fork being synced with my local repo and the upstream repo, my fork master branch is 1 commit ahead freeorion:master, whereas it should display "This branch is even with freeorion:master". Then I want to push those changes to my fork on ("git push origin master" ?) Local and Upstream are now synced (timeline graphics are on par). > In GitHub Desktop, it just requires to click on "Update from /freeorion/master" button. I fetch changes from freeorion/freeorion (upstream) and merge those changes into my local repo ("master"), so the two repositories are synced. In GitHub Desktop, I can open the command console by right-clicking on the local repo name ("Open in Git Shell"), then I can add commands lines (like "git remote -v" in order to know what are the names and url of each repository), if it's that you mean by "adding commands to the menu". (we don't like using git pull because of all the extra commits it creates, plus it then puts your work amongst other commits which makes it harder to spot new stuff in trunk)Īfter having read your post numerous times (something like 20 times ^^), I think I begin to understand. I was also terrible with command line, but I learnt as many git commands as I could because I'm switching systems fairly regularly and remembering a few words to type is easier than leaning completely different buttons to press in radically different GUIs, especially when some of the commands aren't there, despite them being obvious ones. Once you've stored it in as a command it should then be possible to do it multiple times without retyping it. If it's not updating properly, then 'git fetch master' or 'git fetch ' should work, then rebase again. It's possible this might not work, you need to tell it that 'master' is the name of the main repo, or simply store 'git rebase '. You can add commands to the menu, I forget which menu option it is (because I'm on Linux with different software) but I think it was one of the furthest right menus on the topbar, and the command you need is "git rebase master", this will rebase your clone from the master branch and then put your work at the top. It is, but for some reason the command needed isn't there as a basic feature in most of the GUIs.Īssumption: you're using Windows and you're using the GitGUI client (which is what I use(d) on Windows). Is it not possible to update the fork from the local repo, like the local repo is updated from the FO main repo? ![]() And if I want to make a new PR, it contains this useless commit too. So, both my local repo and my fork are one commit ahead the Freeorion main repo. That's OK, the two repositories are synced.īut after that, if I want to sync my local repo and the remote repo (so my fork will be identical to my local repo), it creates automatically a new commit (both on my local repo and on my fork) for the merge (. I can update my local repo from the upstream repo. the upstream repo ( freeorion/freeorion) automatically linked. But there's something I totally don't understand concerning the Sync feature. I can't add images into my fork (only text files) in order to create a PR.Īs I'm very bad with command lines, I thought that GitHub Desktop would be the solution. I can't update my FO fork (in order to be synced with FO main repo) I installed GitHub Desktop because the Web interface (which I exclusively used) lacks two features:
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |