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

added Project.toml to centered_forms branch #53

Draft
wants to merge 11 commits into
base: centered_forms
Choose a base branch
from

Conversation

koehlerson
Copy link

I want to test the centered_forms but it's not possible to add the specific branch with the package manager due to the missing Project.toml file. I copied the Project.toml from the master branch

yashvardhan747 and others added 9 commits February 24, 2019 02:16
* Adding HeapedVector.jl and adding benchmarks

* trying to import Strategy.jl but cant do it

* Error:In Extending the function of StrategyBase.jl

* Tests and some bugs are fixed

* Benchmarks is shift to another branch

* .DS_store is removedand made few changes in Heaped and SortedVector

* All .DS_Store files are removed
* Adding Project.toml

* few additions

* Correct comment in NEWS.md
* Allow bigfloat intervals

* Add tests for `numeric_type`

* Bump version

* Remove unneeded dependencies, clean up
@dpsanders
Copy link
Member

Thanks! Did you rebase against current master?

@koehlerson
Copy link
Author

Yes, I rebased in 130179b - "rebase master".
I used it for the first time tbh. I hope I did it correct. Otherwise I'll start from scratch with a new branch. Just wanted to try it first in order to practice git ☺️

what I did

  • git rebase master in centered_forms branch
  • resolved conflicts
  • resolved the missing deps

@dpsanders
Copy link
Member

I don't understand why src/HeapedVectors.jl is being added, for example.

@koehlerson
Copy link
Author

koehlerson commented Nov 19, 2020

If I understand rebase correctly we're taking the changes of the branch and apply it again to the master? If so, then you have src/HeapedVectors.jl in the master branch: https://github.com/JuliaIntervals/IntervalOptimisation.jl/blob/master/src/HeapedVectors.jl but its not present in the centered_forms branch https://github.com/JuliaIntervals/IntervalOptimisation.jl/tree/centered_forms/src
Therefore, git should add src/HeapedVectors.jl to the updated centered_forms branch when I rebase against master, shouldn't it?

Do I misunderstand something?
If I screw things up here, I'll just start from scratch

@dpsanders
Copy link
Member

git rebase master makes it so that the changes from the branch become changes on top of the current master branch.

Since src/HeapedVectors.jl is in the current master branch, it should not appear in this PR, which should only be the changes on top of current master.

Can you show the output of git rebase master? You might need git push -f to "force push" the changes.

@koehlerson koehlerson marked this pull request as draft November 19, 2020 21:26
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.

8 participants