On Tue, 7 Jun 2016 09:11:21 -0700 (PDT)
Lance Kastel <lkastel4...@gmail.com> wrote:

> New to Git, I have been using bitbucket for my Git repo (as my
> current application used to involve off shore development), looks
> like my master was not synced up with the current development branch.
> How would I update the master with everything in my development
> branch (as I am sure the development branch matches what is deployed
> in current production, I am currently doing a manual update for prod
> deploys). Basically I want to merge from develop branch into master
> and override any conflicts

  $ git fetch origin
  $ git checkout master
  $ git merge -s theirs origin/develop

Will merge "develop" from your "origin" repo into your local "master"
in such a way that should any conflict happen it's resolved with the
version taken from "develop".  (If you want it the other way, use
"-s ours" instead).

Note that you might consider rebasing your "master" on top of "develop"
instead [1].  In this case the 3rd step will be

  $ git rebase origin/develop

1. https://git-scm.com/book/en/v2/Git-Branching-Rebasing

-- 
You received this message because you are subscribed to the Google Groups "Git 
for human beings" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to git-users+unsubscr...@googlegroups.com.
For more options, visit https://groups.google.com/d/optout.

Reply via email to