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

fixed a comment in the Image.proto file #161

Merged
merged 1 commit into from
May 10, 2021
Merged

fixed a comment in the Image.proto file #161

merged 1 commit into from
May 10, 2021

Conversation

addy1997
Copy link
Contributor

@addy1997 addy1997 commented May 10, 2021

changed the spelling of wisth to width. Please follow (#160).

@addy1997 addy1997 requested a review from caguero as a code owner May 10, 2021 08:04
@github-actions github-actions bot added the 🏢 edifice Ignition Edifice label May 10, 2021
@addy1997
Copy link
Contributor Author

addy1997 commented May 10, 2021

@ahcorde, I have made a new PR. Please refer to this commit for details.

Thanks

Copy link
Contributor

@ahcorde ahcorde left a comment

Choose a reason for hiding this comment

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

This PR has two commits, can you remove this one c227768 ?

@addy1997
Copy link
Contributor Author

This PR has two commits, can you remove this one c227768 ?

@ahcorde,Please could you guide me about removing the commit? I tried it earlier but couldn't do it.

@ahcorde
Copy link
Contributor

ahcorde commented May 10, 2021

This is happening probably because you have an outdated branch.

# Keep you changes in a new branch
git checkout -b comment-fixed_old
# checkout ign-msgs7
git checkout ign-msgs7
# update the branch
git pull origin ign-msgs7
# Remove the old branch
git branch -D comment-fixed
# created a new branch based on the recent changes
git checkout -b comment-fixed
# Include your changes
git cherry-pick e2c81c46b6db5c6ff4413f975e2a1d57d0c5a114
# push changes to your branch
git push -f origin comment-fixed

Signed-off-by: addy1997 <adwaitnaik2@gmail.com>
@addy1997
Copy link
Contributor Author

This is happening probably because you have an outdated branch.

# Keep you changes in a new branch
git checkout -b comment-fixed_old
# checkout ign-msgs7
git checkout ign-msgs7
# update the branch
git pull origin ign-msgs7
# Remove the old branch
git branch -D comment-fixed
# created a new branch based on the recent changes
git checkout -b comment-fixed
# Include your changes
git cherry-pick e2c81c46b6db5c6ff4413f975e2a1d57d0c5a114
# push changes to your branch
git push -f origin comment-fixed

I have done it. Thanks a lot.

@ahcorde
Copy link
Contributor

ahcorde commented May 10, 2021

Thank you for iterating @addy1997

@ahcorde ahcorde enabled auto-merge (squash) May 10, 2021 10:50
@ahcorde ahcorde merged commit 3d8d828 into gazebosim:ign-msgs7 May 10, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🏢 edifice Ignition Edifice
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants