search

AlexTelon / FlexiCharge-Org

FlexiCharge Organization repo
3 stars 45 forks source link

Added my handle #31

Closed AntonThoresson closed 1 year ago

AntonThoresson commented 1 year ago

Hope the formation is correct

AlexTelon commented 1 year ago

The change itself looks good. But it seems you need to do a rebase locally yo fixed the merge conflict. On my phone now and the app won't show me the conflict..

AntonThoresson commented 1 year ago

Should be fixed

AlexTelon commented 1 year ago

Almost. This fixed the conflict sure but unless I'm mistaken your change would introduce a new empty row for a test lead.

Your change should be just +1 line and -1 line.

If you remove the empty test lead line and git will be happy.

I can understand the confusion though. Merging and rebasing is the tricket part of normal git work.

AntonThoresson commented 1 year ago

4 commits later and hopefully its fixed, lmk if its not and i will delete the pull and my fork and redo the process so its correct