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

wrong merging path #229

Merged
merged 4 commits into from
Aug 23, 2022
Merged

wrong merging path #229

merged 4 commits into from
Aug 23, 2022

Conversation

vovan-zt
Copy link
Contributor

popup

Demo |
Code base

The code is submitted in a dedicated feature branch.

wrong merging path

@yaripey
Copy link

yaripey commented Aug 19, 2022

Don't just add new files, remove old ones.

@yaripey
Copy link

yaripey commented Aug 19, 2022

For passing-by mentors, this PR is for moving files that are already merged, just with a wrong path.

@OleksiyRudenko
Copy link
Member

@vovan-zt normally renaming with git mv does the job

@vovan-zt
Copy link
Contributor Author

then I need to do it on the first branch that was confirmed and delete this branch?

@OleksiyRudenko
Copy link
Member

You must have the wrong-named files on your main where you branched off to create this PR.
If it is true then just delete those, commit and update this PR.
If it is not true then you'd need to update your main, rebase this branch on top of it and make the situation true ;)
This way we emulate files renaming with git mv.

@OleksiyRudenko OleksiyRudenko mentioned this pull request Aug 21, 2022
@OleksiyRudenko
Copy link
Member

Now it looks all good.
image

Other changes are minor (formatting), although a few empty lines look redundant. But I guess we can live with it.

@artem-trubin WDYT?

@OleksiyRudenko OleksiyRudenko requested a review from yaripey August 22, 2022 14:18
@OleksiyRudenko OleksiyRudenko merged commit afa3a61 into kottans:main Aug 23, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants