Is this git merge ok ?
I'm making a pull request(First time) to an oss and the reviewers told me to make some changes when I made my changes I noticed that I made a merge … is this ok, or should I undo it (which I'm struggling with it right now.) Also, I want to rename the commits.
3 Replies
yes merging is okay
its generally ok although some OSS projects have very specific branching, commit naming, etc rules
see if they have contributing guidelines
re: renaming - the easiest (?) way is interactive rebase. but i would recommend not to rename if you have already pushed the commits - at this point you're effectively rewriting history
most projects don't preserve individual commits when merging PRs anyway, so you can name them whatever you want
Thank you for your nice explanation. I decided to not rename them because as you said they were already pushed and got reviewed by reviewers.