search

stevensblueprint / blueprint_website

Blueprint Website
https://sitblueprint.com/
5 stars 6 forks source link

add new contributer Derrick Sual #202

Closed dersual closed 1 month ago

dersual commented 1 month ago

Quick question, do you just want me to use the web editor to resolve the conflicts rn, because I am just pulling because I want to delete my local branch later so I can begin working on my task. If this could be answered at tomorrow's tech team meeting, this would be great. An explanation of how the process of what to do after your new branch is finally merged with main would be great too. Thanks in advance for reading this comment.

Caposto commented 1 month ago

@dersual I would recommend resolving merge conflicts locally. Once you push to your branch it will update the Pull Request. After PRs are approved, the author of the branch (which is you in this case) can merge it and the branch can be deleted. I would be happy to discuss this more at tomorrow's Tech Team meeting, but great questions!

dersual commented 1 month ago

Ok, thanks!