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

-- 
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