Hello Everyone, I have two branches in my Efabless...
# general
r
Hello Everyone, I have two branches in my Efabless repository: main (the default branch) and top-integration (which is the most up-to-date). I tried to create a pull request to merge top-integration into main, but I encountered a "504 Gateway Time-out" error. When I attempted to set top-integration as the default branch instead, I received a "Permission Denied" error. Does anyone have tips on how to resolve this?
The error messages:
m
I think the Gateway time-out is an intermittent error. Keep trying to create a pull-request.
👍 1
r
Thanks for answering. I’ll keep trying
This issue is still happening. I haven't been able to merge the branches yet.
m
@Anton Maurovic (efabless support) Is this a question for omla?
a
@Mitch Bailey @Rafael Oliveira yes, I expect so. I will pass this to our internal team. I will suggest an alternative you can do, shortly.
@Rafael Oliveira for now I suggest this workaround: • Create a new project on the shuttle -- this will create a new repo, and hence you'll get the URL for it. Copy the URL (just the part which matches the pattern:
<http://repositories.efabless.com/YourUsername/YourRepoName|repositories.efabless.com/YourUsername/YourRepoName>
) • In your existing local repo, make sure you are on your
top-integration
branch already, and you're happy with its state. • Run:
git remote add ef-new <ssh://git>@_<http://repositories.efabless.com/|repositories.efabless.com/>*YourUsername*/*YourRepoName*_
• Then run:
git push ef-new top-integration:main --force
and this should force-push specifically your local
top-integration
branch into the
main
branch of the new repo. • Expect (as usual) you will see a "remote: ERROR" message but it should still complete successfully with (I think) a final output line that includes "`top-integration -> main`" • Refresh your new repo web browser page, and hopefully you'll see your data in there, see that it is what our server calls the
main
branch, and should hopefully have the same latest commit that your local
top-integration
repo has. Each time you need to push after that, you will need to execute this (slightly shorter) command in full:
git push ef-new top-integration:main
Note that this does not prevent you from (now or later) still doing a regular
git push
to whatever your default upstream is, if you want to.
Another option that might be better (so long as you don't experience any secondary issues with your existing repo on our server) is to merge your
top-integration
branch locally into your
main
branch, and then push your local main branch to your original repo on our server. There's no need (and possibly no benefit) to specifically use the PR/merge functionality on our web UI.
👍 1
r
I used the second approach of cloning the repo locally, then merged top-integration into main and finally pushed the update main branch into the efabless server. It worked for me.
👍 1
a
Excellent! Thanks @Rafael Oliveira