Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[IP-1] Working expense module for 1.5.10.1 #688

Open
wants to merge 11 commits into
base: v1.5.10.1
from

Conversation

Projects
None yet
2 participants
@chrispytorius
Copy link

chrispytorius commented Feb 16, 2019

Sorry i messed up my first pull request, this one is has the correct files. Git is new to me :/

Pull Request Checklist

  • [x ] My code follows the code formatting guidelines.
  • [ x] I have an issue ID for this pull request.
  • [ x] I selected the corresponding branch.
  • [ x] I have rebased my changes on top of the corresponding branch.

Issue Type (Please check one or more)

  • Bugfix
  • Improvement of an existing Feature
  • [ x] New Feature

chrispytorius added some commits Feb 16, 2019

@pradeshc

This comment has been minimized.

Copy link

pradeshc commented Feb 18, 2019

@chrispytorius Thank you,

Please check your files again. There are a few files that have recorded no change (perhaps end-of-line or end-of-file changes but are listed here as modified. Configure your git to ignore whitespace changes.

Also, it is not a good practice to change your master branch and push that to a derivative branch. Rather create a new branch that matches your task number and then make your changes against this. You can then submit a pull request to merge that branch to the target branch (in this case v1.5.10.1)

@chrispytorius chrispytorius changed the title [IP-1] Working expense module for 1.5/1.6 [IP-1] Working expense module for 1.5.10.1 Feb 20, 2019

@chrispytorius

This comment has been minimized.

Copy link
Author

chrispytorius commented Feb 20, 2019

@pradeshc

Thanks for the help, i have updated the pull request with the whitespace changes removed, and i have updated to the correct target branch. Hopefully this is now correct.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.
You signed in with another tab or window. Reload to refresh your session. You signed out in another tab or window. Reload to refresh your session.