This is the mail archive of the patchutils-list@sourceware.org mailing list for the patchutils project.
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |
Other format: | [Raw text] |
On Thu, 2008-06-19 at 23:27 +1000, Jack Andrews wrote: > is it solved in the case i have the base source as well as the patches? Certainly 'git rebase -i' seems to manage it quite well for git repositories. It is more sophisticated in that it allows several different types of 'merge driver' to help with merge conflicts. Tim. */
Attachment:
signature.asc
Description: This is a digitally signed message part
Index Nav: | [Date Index] [Subject Index] [Author Index] [Thread Index] | |
---|---|---|
Message Nav: | [Date Prev] [Date Next] | [Thread Prev] [Thread Next] |