search

GeekHaven / Leave-Application-Portal

Leave application portal for IIITA to speed up leave approval process
https://leave-application-portal.herokuapp.com/
8 stars 20 forks source link

Removed all errors and no-file file form submission fixes #53 #57

Closed thesmallstar closed 5 years ago

thesmallstar commented 5 years ago

issue: #53

thesmallstar commented 5 years ago

I am not sure why I get the file changed from the last PRs any idea about that? similar errors appear for other invalid inputs :) suc1 er1

prateek76 commented 5 years ago

@thesmallstar did you made pr from this branch for last issue?

thesmallstar commented 5 years ago

Yes, also,it was merged.

prateek76 commented 5 years ago

@thesmallstar try making pr with new branch

thesmallstar commented 5 years ago

You mean I should scrap this PR? From next time I will also create new branches for every issue.

prateek76 commented 5 years ago

@thesmallstar delete the branch after your pr is merged alway try to make pr from a new branch

thesmallstar commented 5 years ago

Okay, I will remember that :)

thesmallstar commented 5 years ago

@prateek76 this PR still solves the issue mentioned do I need to change anything in this one ?

prateek76 commented 5 years ago

@prateek76 this PR still solves the issue mentioned do I need to change anything in this one ?

it contain previous commits, can you make a new pr for this?

thesmallstar commented 5 years ago

@prateek76 I have only one branch, Um I guess the changes are already merged. So it won't affect, also the files dont appear in files changed so it is actually adding only new changes.

prateek76 commented 5 years ago

@thesmallstar remove previous commits or make a new pr for this

thesmallstar commented 5 years ago

@prateek76 I have tried my best, new weird issues keep coming. I have decided to delete the forked repo and fork it again and then make all the changes. Do you have any suggestion?

prateek76 commented 5 years ago

@prateek76 I have tried my best, new weird issues keep coming. I have decided to delete the forked repo and fork it again and then make all the changes. Do you have any suggestion?

is your master up to date?

thesmallstar commented 5 years ago

I messed up with master while squashing commits. I tried creating new branch and then pull upstream but it is showing 1 file changed( I didnt find a reason for this) https://github.com/GeekHaven/Leave-Application-Portal/compare/master...thesmallstar:master And hence, I am not able to make a branch which is even with your master.

prateek76 commented 5 years ago

I messed up with master while squashing commits. I tried creating new branch and then pull upstream but it is showing 1 file changed( I didnt find a reason for this) master...thesmallstar:master And hence, I am not able to make a branch which is even with your master. have you tried cloning again?

thesmallstar commented 5 years ago

@prateek76 Yes I did try cloning again. Gives me the same Error. what else can be wrong? I am stuck here.

thesmallstar commented 5 years ago

@prateek76 the file changed it is showing are the one already merged. I don't know what can be causing it. Should I just recreate the repo? This pr keeps me stuck.

prateek76 commented 5 years ago

@thesmallstar try this https://help.github.com/articles/syncing-a-fork/ if it still not works refork

thesmallstar commented 5 years ago

Sir, That was a lifesaver :D

thesmallstar commented 5 years ago

@prateek76 It worked :D Everything LG now.