yes just do
git checkout master git pull git checkout mobiledevicesupport git merge master
to keep mobiledevicesupport in sync with master
then when you’re ready to put mobiledevicesupport into master, first merge in master like above, then …
git checkout master git merge mobiledevicesupport git push origin master
and thats it.
the assumption here is that mobilexxx is a topic branch with work that isn’t ready to go into your main branch yet. So only merge into master when mobiledevicesupport is in a good place
Related Posts:
- What is the best (and safest) way to merge a Git branch into master?
- Git merge hotfix branch into feature branch
- 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?
- Move the most recent commit(s) to a new branch with Git
- Move the most recent commit(s) to a new branch with Git
- 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”?
- How do I copy a version of a single file from one Git branch to another?
- 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 to use Git Revert
- How do I properly force a Git push?
- 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?
- GitHub Error Message – Permission denied (publickey)
- How do you push a tag to a remote repository using Git?
- Gitignore not working
- How do I resolve git saying “Commit your changes or stash them before you can merge”?
- How to cherry-pick multiple commits
- Undo git pull, how to bring repos to old state
- Another git process seems to be running in this repository
- rejected master -> master (non-fast-forward)
- merge one local branch into another local branch
- Can I share my private GitHub repository by link?
- How to rename a directory/folder on GitHub website?
- Create a git patch from the uncommitted changes in the current working directory
- git push says “everything up-to-date” even though I have local changes
- How to create a .gitignore file
- How do I rename a repository on GitHub?
- git: fatal: Could not read from remote repository
- Why does git say “Pull is not possible because you have unmerged files”?
- How to see the changes between two commits without commits in-between?
- Git: Installing Git in PATH with GitHub client for Windows
- How to delete a stash created with git stash create?
- In a Git repository, how to properly rename a directory?
- How to “git clone” including submodules?
- My new Github page isn’t showing up
- Update Git branches from master
- Get changes from master into branch in Git
- Why should I use core.autocrlf=true in Git?
- How to interactively (visually) resolve conflicts in SourceTree / git
- Git Extensions: Win32 error 487: Couldn’t reserve space for cygwin’s heap, Win32 error 0
- Git lfs – “this exceeds GitHub’s file size limit of 100.00 MB”
- Aborting commit due to empty commit message
- How to update a branch with master on GitHub
- Your repository has no remotes configured to push to
- Specify an SSH key for git push for a given domain
- How do I “un-revert” a reverted Git commit?
- git push not send changes to remote git repository
- How to merge a specific commit in Git
- How to use Git and Dropbox together?
- Git: Where exactly is the “working directory”?
- What exactly does the “u” do? “git push -u origin master” vs “git push origin master”
- Add latest commit info on login footer using login_footer hook
- Display GitLab repositories of the logged in user on a page