Using your favorite text editor, such as Visual Studio Code, make the necessary changes to files in your project. For more information, see " Configuring Git for GitHub Desktop." Choosing a branch and making changesĬreate a new branch, or select an existing branch by clicking Current Branch on the toolbar and selecting the branch from the list. If the commits you make in GitHub Desktop are associated with the wrong account on GitHub, update the email address in your Git configuration using GitHub Desktop. You can also add a co-author on any commits you collaborate on. When you make a commit, you must include a commit message that briefly describes the changes. Git assigns each commit a unique ID, called a SHA or hash, that identifies: the selected commit is lost (and I think it reverts to the first commit)įor reference, we addressed an issue with history getting out of sync when pulling from the remote #3541, but I don't think I can apply the same fix here (the merge base of master and your dev branch are after the missing commit).Similar to saving a file that's been edited, a commit records changes to one or more files in your branch.the virtualized list flickers when being cleared and repopulated.We do this because clearing the list introduces some visual problems: This however seems to break in cases where you've merged master into your development branch, as the app sees the newer commit already cached and won't apply the right steps to unify the two histories (it ignores older history). So just throw it out and we'll start over fresh. loaded have diverged significantly or in some non-trivial way But if we didn't, it means the history we had and the history we just If we found the old HEAD, then we can just splice the new commits into If I switch to master branch and return to perso branch, the commit disappearsĬonst index = commits. When I go to perso branch for the 1st time, I can see the commit. * f11faf98 Use htmlawed for "reparing" broken html only | * ad806e28 (origin/master, origin/HEAD, master) Merge pull request #1121 from vincent3569/master * b9455336 (HEAD -> perso, origin/perso) Merge branch 'master' into perso GitHub\zenphoto-perso>git log -graph -oneline It's the new feature commit that you're not seeing sometimes in the repository, correct? * fc8c810a Merge pull request #1117 from vincent3569/master * 928c6812 Fix undeclared global js variables required by admin toolbox for delete links. * a4cdd5d0 Revert: Again use htmlawed as fallback only if native php tidy extension is not available #1116 * 664c4fac Merge pull request #1119 from vincent3569/master * 26e04786 Small text addition to last pull request/commit as manual pagebreak is not exactly tinyMCE dependent. * 316514f2 Show note in admintoolbox if site status is "closed for testing" fix #1120 | * | 407b490a update french translations * | \ b2d89737 Merge branch 'master' into perso | * ad806e28 Merge pull request #1121 from vincent3569/master * b9455336 Merge branch 'master' into perso ~/src/test/zenphoto-perso/ git log -graph -oneline On my_repo/master I made a "merge into current branch" from upstream/master.Īnd on my_repo/perso I made a "merge into current branch" from master.Īfter that, my personnal commit on my_repo/perso desapears from changes history of this branch. I want to keep my fork sync with upstream (although it seems to be useless since my repo is up to date because I am at the initiative of the changes). I merge master branch into perso branch (so I have all commits of my new feature + my translations update)Īfter the pull request has been merged into upstream/master, In master branch, I updated some translations and I made a pull request to the initial repo. In my repo, I have 2 branchs (master and perso). I have a repositoty ( ) that is a fork from another repo ( )
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |