How to keep a branch synchronized/updated with master?

by

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 that’s 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.

More Related Contents:

  1. What is the best (and safest) way to merge a Git branch into master?
  2. Why does git perform fast-forward merges by default?
  3. How do I safely merge a Git branch into master?
  4. Git merge hotfix branch into feature branch
  5. Git merge branch into master
  6. How do I rename a local Git branch?
  7. How do I push a new local branch to a remote Git repository and track it too?
  8. Move existing, uncommitted work to a new branch in Git
  9. I ran into a merge conflict. How can I abort the merge?
  10. Git fetch remote branch
  11. Showing which files have changed between two revisions
  12. How to fetch all Git branches
  13. Merge, update, and pull Git branches without using checkouts
  14. Re-doing a reverted merge in Git
  15. Remove tracking branches no longer on remote
  16. Cleaning up old remote git branches
  17. Git: Find the most recent common ancestor of two branches
  18. How do I remove local (untracked) files from the current Git working tree?
  19. How can I clone all remote branches?
  20. Which version of the git file will be finally used: LOCAL, BASE or REMOTE?
  21. Git merge error “commit is not possible because you have unmerged files”
  22. how can I customize git’s merge commit message?
  23. error: Your local changes to the following files would be overwritten by checkout
  24. Git Diff of same files in two directories always result in “renamed”
  25. Git branch name – case sensitive or insensitive?
  26. How to merge specific files from Git branches
  27. How to ‘git pull’ into a branch that is not the current one?
  28. Git: How to list commits on this branch but not from merged branches
  29. Telling if a Git commit is a Merge/Revert commit
  30. How to quit (not abort) a Git merge in progress keeping the changes uncommitted?

Leave a Comment