Skip to content

Added SIGNUM #1966

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

Merged
merged 9 commits into from
Jan 15, 2025
Merged

Conversation

GillesDuvert
Copy link
Contributor

closes #1956

@GillesDuvert
Copy link
Contributor Author

something fussy with all these merge origin/master that seem sticky. And the authoring by gildas@localhost is strange too. Keeping fingers crossed.

@GillesDuvert GillesDuvert mentioned this pull request Jan 13, 2025
@slayoo
Copy link
Member

slayoo commented Jan 13, 2025

something fussy with all these merge origin/master that seem sticky. And the authoring by gildas@localhost is strange too. Keeping fingers crossed.

@GillesDuvert, your fork's master branch has commits that are not on gnudatalanguage/master:
image
hence all branches branched out of GillesDuvert/master are "out of sync" with the main repo.

It is likely a good idea to force-push your main to a state where there are no commits "behind" or "ahead" of gnudatalanguage/master

HTH.

Copy link

codecov bot commented Jan 13, 2025

Codecov Report

Attention: Patch coverage is 2.43902% with 40 lines in your changes missing coverage. Please review.

Project coverage is 42.45%. Comparing base (aa9693b) to head (895226a).
Report is 2 commits behind head on master.

Files with missing lines Patch % Lines
src/math_fun.cpp 0.00% 40 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##           master    #1966      +/-   ##
==========================================
- Coverage   42.47%   42.45%   -0.02%     
==========================================
  Files         444      444              
  Lines      110117   110158      +41     
  Branches    22040    22055      +15     
==========================================
+ Hits        46772    46773       +1     
- Misses      63345    63385      +40     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@GillesDuvert
Copy link
Contributor Author

GillesDuvert commented Jan 14, 2025

something fussy with all these merge origin/master that seem sticky. And the authoring by gildas@localhost is strange too. Keeping fingers crossed.

@GillesDuvert, your fork's master branch has commits that are not on gnudatalanguage/master hence all branches branched out of GillesDuvert/master are "out of sync" with the main repo.

It is likely a good idea to force-push your main to a state where there are no commits "behind" or "ahead" of gnudatalanguage/master

HTH.

@slayoo ahem, I'm using the git interface of NetBeans and I do not see a button 😄 to do that. Should a simple git command do it? and what command?

@GillesDuvert
Copy link
Contributor Author

And @slayoo is it OK to squash/merge this PR or shall I redo it after force-pushing my main with this mysterious git command?

@slayoo
Copy link
Member

slayoo commented Jan 15, 2025

And @slayoo is it OK to squash/merge this PR or shall I redo it after force-pushing my main with this mysterious git command?

Since we are squash-merging, there is no difference.

@slayoo
Copy link
Member

slayoo commented Jan 15, 2025

@slayoo ahem, I'm using the git interface of NetBeans and I do not see a button 😄 to do that. Should a simple git command do it? and what command?

Assuming we have an upstream remote defined (i.e., git remote add upstream [email protected]:gnudatalanguage/gdl.git), this should do:

git fetch upstream
git switch main
git rebase upstream/main
git push -f

(I've checked and all the contents of the "ahead" commits on your master branch are already effectively part of gnudatalanguage/gdl:master, but there must have been a PR from your master branch, so a squash-merge left your master branch in the "ahead" state)

The rebase part of the above set of commands will try to apply the 8 "ahead" commits one-by-one onto the remote's master:master...GillesDuvert:gdl:master

After the push -f, the `master should be in-sync.

A key pattern that will make sure the above is not needed anymore in future is to:

  • always start a branch from master
  • never commit to master

HTH, best!
S.

@GillesDuvert
Copy link
Contributor Author

yes it may have happened I made a PR from the master, 😊 😊

@GillesDuvert GillesDuvert merged commit a41ca66 into gnudatalanguage:master Jan 15, 2025
7 of 9 checks passed
@GillesDuvert
Copy link
Contributor Author

@slayoo Except that I needed to create a ssh key in GitHub to do the job, all this worked perfectly well, thanks to our team git expert!

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

Successfully merging this pull request may close these issues.

SIGNUM function
2 participants