|
From: | Andreas Schwab |
Subject: | Re: In git, how does one revert a single file with merge conflicts in it? |
Date: | Tue, 03 Feb 2015 10:04:41 +0100 |
User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.4 (gnu/linux) |
Your case is explicitly and elaborately handled in the manual. Andreas. -- Andreas Schwab, SUSE Labs, address@hidden GPG Key fingerprint = 0196 BAD8 1CE9 1970 F4BE 1748 E4D4 88E3 0EEA B9D7 "And now for something completely different."
[Prev in Thread] | Current Thread | [Next in Thread] |