|
| From: | Andreas Schwab |
| Subject: | Re: dealing with local patches - mercurial queues over bzr/git checkout |
| Date: | Mon, 06 Jan 2014 23:04:05 +0100 |
| User-agent: | Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) |
Achim Gratz <address@hidden> writes: > If you have lots of changes that create merge conflicts, you'll want > to find a way to (almost) automatically deal with them, but you'd have > the same problem with actual merges. git rerere is supposed to help with repeatedly solving merge conflicts. Andreas. -- Andreas Schwab, address@hidden GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 "And now for something completely different."
| [Prev in Thread] | Current Thread | [Next in Thread] |