[llvm-dev] I've intertwined two branches

[Paul C. Anagnostopoulos via llvm-dev]

And to some of us that ain't quite the best, yet.

Will it cause a problem if I rename 'assert' to 'old-assert' and then 
create a new 'assert' branch? I shouldn't think so.

The 'lists' branch isn't needed anymore, so I can just delete it once I 
know the build is okay.

Thanks!

~~ Paul


On 4/8/2021 11:01 AM, Stella Laurenzo wrote:
> Git happens to the best of us :)
>
> Since you've already pushed, upstream should be considered source of 
> truth. If I were you, I would start a new branch, pull fresh from 
> upstream and then git cherrypick commits you want to keep from your 
> local branches into the new branch. The git reflog is your friend on 
> this, especially if you start resetting, etc.
>
> Since I see you are on Windows, I recall some of these things to be 
> fairly easy with the Forks git gui.
>
> There are probably better ways to repair, but for me, when I mess it 
> all up, I find it easier to low tech reconstruct what I want vs 
> advanced solutions.
>
> On Thu, Apr 8, 2021, 6:12 AM Paul C. Anagnostopoulos via llvm-dev 
> <llvm-dev at lists.llvm.org <mailto: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
>
>     I have no idea how I did this. Unfortunately, I ended up pushing
>     both revisions when I meant to push only the 'lists' branch. I
>     could use some help sorting out my local repository.
>

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