Skip to content

Conversation

@hoffmann-stefan
Copy link
Member

Original work from #127 @Chootin

Was playing around with lazygit and wanted to try to split some commits for better history. Did take #127 as playground ;)

@Chootin Hope you are OK with this?

The rest of the PR is in this branch https://github.com/hoffmann-stefan/ros2_dotnet/pull/new/upstream_pr2_params_rebased to avoid having to fix the merge commits when rebasing again. This could be force-pushed onto #127 after this is merged to review further.

@hoffmann-stefan hoffmann-stefan force-pushed the upstream_pr2_qos branch 2 times, most recently from 984a48b to 4294479 Compare July 24, 2024 06:46
@Chootin
Copy link
Contributor

Chootin commented Jul 25, 2024

Quite interesting that altering the commits to that level is possible without affecting the authorship details! I'm happy with the result 👍

@hoffmann-stefan
Copy link
Member Author

Quite interesting that altering the commits to that level is possible without affecting the authorship details! I'm happy with the result 👍

Well, unless you sign your commits with gpg there is no way to enforce this in a distributed vcs. There are git commands/options to manipulate the author of a commit. (e.g. https://stackoverflow.com/a/3042512)

Copy link
Member Author

@hoffmann-stefan hoffmann-stefan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Chootin: Looks good, even though I can't technically approve my PR, the changes are from you :)

@hoffmann-stefan hoffmann-stefan merged commit c31d886 into ros2-dotnet:main Jul 29, 2024
@hoffmann-stefan hoffmann-stefan deleted the upstream_pr2_qos branch July 29, 2024 15:09
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.

4 participants