User login

Choosing all the remotely changed files in a git conflicted merge

Stricken with fear at the thought of handling a huge conflicted merge file by file, when you know you can just pick one side of the conflict and be done with it?


git pull

gives you the bad news...

git mergetool

is usually the first recourse.

Used meld, my default for git mergetool, for the first one. Which fortunately was the only one i wanted to merge manually.

I refused to merge the next one and then took the provided opportunity to cancel the merge.


git checkout --theirs databases/development/
git add databases/development
gcm "Chose remote for all development database dump."

(Where gcm happens to be an alias to git commit -m on my system.)

This works equally well for choosing all locally modified files, of course, with the --ours flag instead of --theirs.

Searched words: 
merge choose all remote git git choose remote for a whole bunch of conflicted files combine pick all


Post new comment

The content of this field is kept private and will not be shown publicly.
  • You may post code using <code>...</code> (generic) or <?php ... ?> (highlighted PHP) tags.
  • You can use Markdown syntax to format and style the text. Also see Markdown Extra for tables, footnotes, and more.
  • Web page addresses and e-mail addresses turn into links automatically.
  • Allowed HTML tags: <a> <em> <strong> <cite> <code> <ul> <ol> <li> <dl> <dt> <dd> <img> <blockquote> <small> <h2> <h3> <h4> <h5> <h6> <sub> <sup> <p> <br> <strike> <table> <tr> <td> <thead> <th> <tbody> <tt> <output>
  • Lines and paragraphs break automatically.

More information about formatting options

By submitting this form, you accept the Mollom privacy policy.