Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update protocol submodule to master branch from #p27 #47

Closed
AntumArk opened this issue Jun 26, 2019 · 17 comments
Closed

Update protocol submodule to master branch from #p27 #47

AntumArk opened this issue Jun 26, 2019 · 17 comments

Comments

@AntumArk
Copy link

@btsimonh Are you working to update protocol submodule? I am just trying to remind you in case you may forget.

@btsimonh
Copy link
Contributor

I think it's done (it was a few mins after the main repo....)? pls confirm it all builds once both masters are pulled....

@AntumArk
Copy link
Author

image
It is still detached head.

Building things now :D

@btsimonh
Copy link
Contributor

subrepos - bahh... trying to fix it now!

@btsimonh
Copy link
Contributor

pls check again. all should be good now.

@AntumArk
Copy link
Author

@btsimonh Everything built successfully.

@AntumArk
Copy link
Author

Ok, now it is latest commit, but still detached head.
image
You can't make PR to detached heads.

@btsimonh
Copy link
Contributor

hmm... not seeing that through github or sourcetree....
Are you working from btsimonh or bipropellant? - they should be the same, but the btsimonh one is a little of a plaything.

@AntumArk
Copy link
Author

bipropellant

Cloning with reccursive submodules using gitbash, then adding all repos to github desktop.

@btsimonh
Copy link
Contributor

ok, I'll try a small mod on each and commit from github, change to readme maybe. one moment.

@AntumArk
Copy link
Author

In the meantime I am trying to clone on Sourcetree

@AntumArk
Copy link
Author

Same thing, it checks out on that specific commit.
image
Although it can handle submodules, where github desktop - not.

@p-h-a-i-l
Copy link
Member

Well, detached head is "ok" when working with submodule. A submodule does not reference a branch or head, it references a single commit. This way you can make sure that the "main" repo decides which commit is ok.

You can open git in your submodule folder and checkout the correct branch. This way the head shouldnt be detached anymore.

@AntumArk
Copy link
Author

@btsimonh It is now synced. Head is now synced upon cloning.
image

@EFeru
Copy link

EFeru commented Jun 26, 2019

@btsimonh, maybe you can update the Travis link in Readme to point to the bipropellant build check. At the moment it links to my fork Travis build.

@p-h-a-i-l
Copy link
Member

@btsimonh, maybe you can update the Travis link in Readme to point to the bipropellant build check. At the moment it links to my fork Travis build.

done

@btsimonh
Copy link
Contributor

In the meantime I am trying to clone on Sourcetree

I use sourcetree for all my windows git operations; it's not perfect for submodules, but I'm kind of getting used to it :).

@p-h-a-i-l
Copy link
Member

I gave up on using a fancy GUI for git. Just using the built in functions from vscode and git bash.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

4 participants