pyup-bot mentioned this pull request 9 days ago. Conversation 0 Commits 1 Checks 0 Files changed 1. Hopefully this quick note might help someone who found themselves in the same position as me. pyup-bot wants to merge 1 commit into master from pyup-update-setuptools-38.2.5-to-65.5.1. As shown above, the change added on issue1 described in the previous page isnt included in myfile.txt on master branch. It seems to be safe and to sort out the issue of ‘Your branch is ahead of ‘origin/master’ by x commits’. This will fetch and merge the current branch from the remote to my local branch- and also update my local tracking branch – origin/mybranch – to point to the latest commit – and – it will pull the remote master branch into origin/master and merge that into your local master branch. The thing is – I was being too clever and trying to avoid pulling and updating master. It says everything is up-to-date – but you get the horrible ‘Your branch is ahead of ‘origin/master’ by x commits’ message – WTF!ĮDIT: What this is saying is that your local master branch is ahead of your local copy of the remote master branch – origin/master – which you’ve just pulled down.ĮDIT: Your local master branch must have new commits which you had not pushed to origin. Which updates your local mybranch nicely. Major Git hosting services already use main as the default. Git will move the default value for this setting from master to main in due course. You have a remote repository and push some code updates to it from a local repository – you then switch to a different local repository and pull down the updated code from the remote repository with: Git 2.28 () introduced the faultBranch option, which controlls the default branch name for repos created with git init: git config -global faultBranch main. This is an annoyingly simple issue – so simple that it may not be blogged elsewhere.
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |