search

AlexTelon / FlexiCharge-Org

FlexiCharge Organization repo
3 stars 45 forks source link

added my name #15

Closed WinterBoii closed 1 year ago

AlexTelon commented 1 year ago

Please see the example at the top of the page. Make your name a markdown link.

AlexTelon commented 1 year ago

I'm sorry the merge you did is not what we should have. The change in the end should be "+1 -1".

If can understand the confusion, dealing with git conflicts is tricky at first. But your commit in the end should only change 1 line.

WinterBoii commented 1 year ago

now? its +4 but i added space

AlexTelon commented 1 year ago

yes your last commit is only 1 line change. But in aggregate you have added 3 more.

image

here in github you can see that if I merge this we will add 3 empty rows for roles that have already been filled in.

You need to ensure that the code on your side is a table without these 3 extra rows.

Edit: actually what i draw there was a bit lazy. What you should do is to ensure that your name is added in the empty SM line between the PO and the test lead

AlexTelon commented 1 year ago

You could do a hard reset of your branch to "origin main" and then do your change and force push to your WinterBoii:add_my-name branch. or create a new PR where you start over which is kidnof similar but not as neat.