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.

Sign up for GitHub

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

Jump to bottom

Add conflicts with ignition-tools1 #2

Merged
merged 2 commits into from
Apr 15, 2022
Merged

Add conflicts with ignition-tools1 #2

merged 2 commits into from
Apr 15, 2022

Conversation

chapulina
Copy link
Contributor

@chapulina chapulina commented Apr 15, 2022 •
edited
Loading

They'll be colliding until we deconflict the ign binary

@chapulina
Add conflicts with ignition-tools1
9091d80 
Signed-off-by: Louise Poubel <louise@openrobotics.org>
@chapulina
Copy link
Contributor Author

Test builds:

  • Build Status
  • Build Status

@chapulina
Copy link
Contributor Author

New builds with replaces

  • Build Status
  • Build Status

@chapulina
Copy link
Contributor Author

Success!

$ sudo apt install ignition-tools2
Reading package lists... Done
Building dependency tree       
Reading state information... Done
The following packages will be REMOVED:
  ignition-tools
The following NEW packages will be installed:
  ignition-tools2
0 upgraded, 1 newly installed, 1 to remove and 57 not upgraded.
Need to get 17.7 kB of archives.
After this operation, 3,072 B of additional disk space will be used.
Do you want to continue? [Y/n]

@chapulina chapulina merged commit c0c7739 into main Apr 15, 2022
@chapulina chapulina deleted the chapulina/conflict branch April 15, 2022 16:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
1 participant
@chapulina