search

enzaimz / c_made_easy

A basic android app to learn C Programming basics
https://play.google.com/store/apps/details?id=com.enzaimz.c_syntax
10 stars 28 forks source link

Updated ifelse #66

Closed amitpola closed 3 years ago

amitpola commented 3 years ago

43 Updated the Ifelse.dart file with "Nested ifelse and ifelse Ladder along with snippets".

Also refractored the code by creating a function that return the card Widget.

abhitidarbar commented 3 years ago

Hey @amitpola ,can you only add the splash.dart and ifelse.dart in your commit and remove unwanted files. Also,please squash your commit in a single commit if you are working on a single issue. You should only have more than one commit if you are working on more than one issue in a single pr.

amitpola commented 3 years ago

Okay

On Sat, Dec 12, 2020, 1:18 PM abhitidarbar notifications@github.com wrote:

Hey @amitpola https://github.com/amitpola ,can you only add the splash.dart and ifelse.dart in your commit and remove unwanted files. Also,please squash your commit in a single commit if you are working on a single issue. You should only have more than one commit if you are working on more than one issue in a single pr.

— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub https://github.com/enzaimz/c_made_easy/pull/66#issuecomment-743719571, or unsubscribe https://github.com/notifications/unsubscribe-auth/AOVSN5KMX7XUPTSH7SDRBBLSUMN3FANCNFSM4UXFL6LA .

amitpola commented 3 years ago

I have deleted the unwanted files but iam unable to remove the commits

amitpola commented 3 years ago

I am unable to remove the commits , please help me with that.

harry-hov commented 3 years ago

Just delete those unwanted files from your local directory and then push it. all things will be fixed.

Deleting is the solution? Seriously??

All things are fine now. @abhitidarbar You can merge it now.

Things are not fine by any means.

harry-hov commented 3 years ago

@amitpola You commented splash.dart in the first commit and undid it in next commit. I don't understand the reason behind it. You just can't create problem and fix it in the next commit.

There are 2 possible solution to this situation:

  1. The hard Way

Revert the changes and edit commits

  1. The easy Way

Copy the relevant changes and start fresh on the new branch.