search

rosin-project / rxros2

Reactive programming for ROS 2
20 stars 2 forks source link

Add installation instructions #10

Closed henrik7264 closed 4 years ago

henrik7264 commented 4 years ago

Update of the README files with information on how to install RxROS2.

henrik7264 commented 4 years ago

I actually had the same thought. It may be much nicer to move the installation instructions to the main README - Do you known how to proceed - now that I have created a pull request?

gavanderhoorn commented 4 years ago

You can just push additional commits to the issue2 branch. The PR will update automatically.

gavanderhoorn commented 4 years ago

@henrik7264: could you please rebase the issue2 branch on current master?

We cannot merge this right now, as it's reverting changes which are already present on master.

henrik7264 commented 4 years ago

Just to be absolutely sure. Is it a git rebase master issue2

you want me to execute - followed by a git push origin --force

gavanderhoorn commented 4 years ago

I would do the following:

git checkout issue2
git fetch origin
git rebase origin/master
git push origin issue2 --force

This leaves no room for ambiguity.

henrik7264 commented 4 years ago

Thanks - never been a good friend with git. Here is the result:

issue2> git checkout issue2
Already on 'issue2'
Your branch is up to date with 'origin/issue2'.
issue2> git fetch origin
issue2> git rebase origin/master
Current branch issue2 is up to date.
issue2> git push origin issue2 --force
Password for 'https://henrik7264@outlook.com@github.com': 
Everything up-to-date
gavanderhoorn commented 4 years ago

Ok, so I assumed origin points to rosin-project/rxros2. Is that the case for you?

What is the output of git remote -v

Edit: hm, looking at the log it does actually seem like issue2 is up-to-date now. I'll take a look at the changes.

gavanderhoorn commented 4 years ago

It looks like 19b4021bf4f44f5c332615e400d9c60eb0ed781c basically added all the sections back about the performance measurements.

Could you check your local copies of the README.md files in each package and make sure to remove those sections (again)?

An alternative would be to fix 19b4021bf4f44f5c332615e400d9c60eb0ed781c, but that may be too involved.

henrik7264 commented 4 years ago 
issue2> git status
On branch issue2
Your branch is up to date with 'origin/issue2'.

nothing to commit, working tree clean
issue2> git remote -v
origin  https://github.com/rosin-project/rxros2.git (fetch)
origin  https://github.com/rosin-project/rxros2.git (push)
issue2>
henrik7264 commented 4 years ago

The performance measurement section is my fault. Copied the files I had prepared for the first update of the installation instructions and modified with the newest installation information you provided. I noticed the performance section, but didn't take any notice of the - I forgot we made a complete repo about that. I shall remove the section from the README files.

gavanderhoorn commented 4 years ago

I've added a few commits @henrik7264.

henrik7264 commented 4 years ago

Very nice additions you added @gavanderhoorn . Like it very much.