[egit-dev] resolving merge conflicts

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index] [List Home]

[egit-dev] resolving merge conflicts

From: Markus Duft <markus.duft@xxxxxxxxxx>
Date: Tue, 17 Jan 2012 14:16:47 +0100
Delivered-to: egit-dev@xxxxxxxxxxx
List-archive: <https://dev.eclipse.org/mailman/private/egit-dev>
List-help: <mailto:egit-dev-request@eclipse.org?subject=help>
List-subscribe: <https://dev.eclipse.org/mailman/listinfo/egit-dev>, <mailto:egit-dev-request@eclipse.org?subject=subscribe>
List-unsubscribe: <https://dev.eclipse.org/mailman/options/egit-dev>, <mailto:egit-dev-request@eclipse.org?subject=unsubscribe>
Organization: Salomon Automation GmbH
User-agent: Mozilla/5.0 (X11; Linux i686; rv:9.0) Gecko/20120109 Thunderbird/9.0

Hey!

Am I just too stupid or is there a problem...:

i'm merging/rebasing and have a conflict in a binary file. now i want to choose which version (ours/theirs) i want to keep. how can i do it? i though of "Replace with > Version from <whatever>" but all those options are completely disabled when stuck in a rebase (at least). ideas?

Thanks,
Markus

Follow-Ups:
- Re: [egit-dev] resolving merge conflicts
  - From: Robin Stocker

Prev by Date: Re: [egit-dev] rebase always fails
Next by Date: Re: [egit-dev] resolving merge conflicts
Previous by thread: [egit-dev] filemode handling
Next by thread: Re: [egit-dev] resolving merge conflicts
Index(es):
- Date
- Thread

Breadcrumbs