[LLVMdev] MCLoggingStreamer enhancements

[Michael Spencer]

On Fri, Oct 8, 2010 at 12:33 PM, Nathan Jeffords
<blunted2night at gmail.com> wrote:
>>
>> I use git exclusively. It makes keeping track of separate patch sets
>> trivial. Just make a branch for each patch set, and have as many
>> commits in each branch as you desire. To upstream them just do "git
>> svn rebase". You can also merge in other branches. To export patches
>> you can just use format-patch which will make a .patch file for each
>> commit in the branch, although I think you have to remove the headers
>> to get coreutils-patch to apply it.
>>
>> - Michael Spencer
>
> Is their any problem when a patch is committed, then gets pulled back into
> your git fork? Does it treat the changes coming from the svn mirror as
> conflicts?

If it matches exactly, git ignores it. If it's different, you can
either merge it (which is easy in git), or just skip it.

- Michael Spencer