How I would do this
git checkout master git pull origin master git merge test git push origin master
If I have a local branch from a remote one, I don’t feel comfortable with merging other branches than this one with the remote. Also I would not push my changes, until I’m happy with what I want to push and also I wouldn’t push things at all, that are only for me and my local repository. In your description it seems, that test is only for you? So no reason to publish it.
git always tries to respect yours and others changes, and so will --rebase. I don’t think I can explain it appropriately, so have a look at the Git book – Rebasing or git-ready: Intro into rebasing for a little description. It’s a quite cool feature
Related Posts:
- Git merge hotfix branch into feature branch
- Move the most recent commit(s) to a new branch with Git
- Move the most recent commit(s) to a new branch with Git
- How do I copy a version of a single file from one Git branch to another?
- How to keep a branch synchronized/updated with master?
- How do I delete a Git branch locally and remotely?
- How do I delete a Git branch locally and remotely?
- How do I rename a local Git branch?
- Undo a Git merge that hasn’t been pushed yet
- How to remove local (untracked) files from the current Git working tree
- Abort a Git Merge
- Git fetch remote branch
- How do I clone a specific Git branch? [duplicate]
- Git fetch remote branch
- How do I push a new local branch to a remote Git repository and track it too?
- How do I push a new local branch to a remote Git repository and track it too?
- How do I push a new local branch to a remote Git repository and track it too?
- How to resolve merge conflicts in a Git repository
- How can I merge multiple commits onto another branch as a single squashed commit?
- How to get just one file from another branch?
- How can I merge multiple commits onto another branch as a single squashed commit?
- Update Git branches from master
- Create a branch in Git from another branch
- How do I rename both a Git local and remote branch name?
- Create Git branch with current changes
- The following untracked working tree files would be overwritten by merge, but I don’t care
- The following untracked working tree files would be overwritten by merge, but I don’t care
- How to get the current branch name in Git?
- How do you create a remote Git branch?
- How to copy commits from one branch to another?
- Make an existing Git branch track a remote branch?
- How do I call git diff on the same file between 2 different local branches?
- How to get the current branch name in Git?
- How do you create a remote Git branch?
- Git error on commit after merge – fatal: cannot do a partial commit during a merge
- Is there a “theirs” version of “git merge -s ours”?
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Branch from a previous commit using Git
- The following untracked working tree files would be overwritten by merge, but I don’t care
- Not a valid object name: ‘master’
- .gitignore and “The following untracked working tree files would be overwritten by checkout”
- Is there a “theirs” version of “git merge -s ours”?
- Move existing, uncommitted work to a new branch in Git
- Delete branches in Bitbucket
- How do I push a local Git branch to master branch in the remote?
- Is it possible to pull just one file in Git?
- How to resolve git status “Unmerged paths:”?
- Resolve Git merge conflicts in favor of their changes during a pull
- Found a swap file by the name
- Is there a git-merge –dry-run option?
- Git pull – Please move or remove them before you can merge
- How do I run git log to see changes only for a specific branch?
- How to create a local branch from an existing remote branch?
- How to find which git branch I am on when my disk is mounted on other server
- How to create a new branch from a tag?
- How do I check out a remote Git branch?
- How do I use ‘git reset –hard HEAD’ to revert to a previous commit? [duplicate]
- What is git tag, How to create tags & How to checkout git remote tag(s)
- What does ‘–set-upstream’ do?
- What does ‘–set-upstream’ do?
- Difference between “git add -A” and “git add .”
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- error: src refspec master does not match any
- What does cherry-picking a commit with Git mean?
- How to cherry pick from 1 branch to another
- How to Git stash pop specific stash in 1.8.3?
- How to use Git Revert
- How do I undo the most recent local commits in Git?
- How do I revert a Git repository to a previous commit?
- How to merge branch to master?
- How do I force git pull to overwrite everything on every pull?
- What happens when I do git pull origin master in the develop branch?
- How do I properly force a Git push?
- How do I rename a local Git branch?
- fatal: Not a git repository (or any of the parent directories): .git [duplicate]
- How can I switch to another branch in git?
- Squash my last X commits together using Git
- Git refusing to merge unrelated histories on rebase
- Git submodule update
- How to apply a patch generated with git format-patch?
- What is the `git restore` command and what is the difference between `git restore` and `git reset`?
- What does ‘git merge –abort is equivalent to git reset –merge when MERGE_HEAD is present.’ of Git merge man page mean?
- What does ‘git blame’ do?
- What is the difference between git push origin and git push origin master
- GitHub: Permission denied (publickey). fatal: Could not read from remote repository
- How to delete a remote tag?
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- Updates were rejected because the tip of your current branch is behind its remote counterpart
- git stash apply version
- How to modify existing, unpushed commit messages?
- Git pushing to remote branch
- How to revert a merge commit that’s already pushed to remote branch?
- What is Git pruning?
- Git pushing to remote branch
- git – remote add origin vs remote set-url origin
- How do I undo ‘git add’ before commit?
- Git: Message ‘src refspec master does not match any’ when pushing commits in Git
- GitHub Error Message – Permission denied (publickey)
- How can I see the differences between two branches?