[llvm-dev] I've intertwined two branches

[Paul C. Anagnostopoulos via llvm-dev]

Good idea. I'll study the reflog to see if I can figure it out. I think 
it may have happened before today.

On 4/8/2021 3:32 PM, Khem Raj wrote:
> On Thu, Apr 8, 2021 at 6:12 AM Paul C. Anagnostopoulos via llvm-dev
> <llvm-dev at lists.llvm.org> wrote:
>> Somehow I have managed to intertwine two branches in my local repository. They are 'assert' and 'lists'. Here is what I see:
>>
>>    Switched to branch 'assert'
>>    c:\llvm\llvm-project> git log2
>>    14580ce2fdd1 (HEAD -> assert, origin/main, origin/HEAD, main, lists) [TableGen] Make behavior of list slice suffix consistent across all values
>>    3b9a15d910a8 [TableGen] Add support for the 'assert' statement in multiclasses
>>
>>     Switched to branch 'lists'
>>    c:\llvm\llvm-project> git log2
>>    14580ce2fdd1 (HEAD -> lists, origin/main, origin/HEAD, main, assert) [TableGen] Make behavior of list slice suffix consistent across all values
>>    3b9a15d910a8 [TableGen] Add support for the 'assert' statement in multiclasses
>>
> from commit SHA they look same branch to me. what cmds did you use to
> switch from assert to lists branch ?  you can use git reflog to
> inspect your tree and see where things changed
>

-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-dev/attachments/20210408/838dca30/attachment.html>