I just want my development branch to prevail (over master), I don't want to resolve any conflicts

I have two branches, master and development.

When trying to merge development into master with git merge development, I get loads of conflicts.

  • How do I access svn branches using git-svn with a non-standard svn repo layout?
  • How does Git handle branches compared to SVN?
  • How to merge remote master to local branch
  • Configure Jenkins to work with SVN branches
  • How can I push a new branch?
  • TFS — Sustainability of Cascading Branches
  • I’m not interested in resolving any conflicts, I just want the master branch to be an exact replica of development – how do I accomplish this?

  • JGit: Transport Exception - reject HostKey: bitbucket.org
  • How to clone a specific Git branch?
  • Create Sub-Projects based on main Git project.
  • Add a removed existing remote to a git repository
  • Creating a new branch with different caplitalization in windows
  • Push to remote server while excluding some committed files?
  • One Solution collect form web for “I just want my development branch to prevail (over master), I don't want to resolve any conflicts”

    Please make sure your working copy is clean, and you’ve committed all your work, before doing this.

    I just want the master branch to be an exact replica of development

    Assuming you’re working with just your local branches,

    git checkout master

    git reset --hard development

    This can be a dangerous operation if you have uncommitted work, but if that’s what you really want to do, this will do it.

    Git Baby is a git and github fan, let's start git clone.