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

OBPIH-2220 Add pick reason code to requisition item #1192

Merged
merged 1 commit into from
Aug 28, 2019
Merged

Conversation

dbienkowska
Copy link
Collaborator

No description provided.

Copy link
Member

@jmiranda jmiranda left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks pretty good, just respond to questions/feedback, add comments where requested, and once I get a chance to create a database migration we can squash the commits and try to get this merged next week.

Can you guys let me know how you've been squashing commits on your end? I think the idea of doing the squashing before push to git like you've been doing. Are you just doing an interactive rebase with a force push? If either case, let me know what command you're using.

@jmiranda
Copy link
Member

@DominikaHatala Can you respond to this when you get a chance?

Can you guys let me know how you've been squashing commits on your end? I think the idea of doing the squashing before push to git like you've been doing. Are you just doing an interactive rebase with a force push? If either case, let me know what command you're using.

@jmiranda jmiranda merged commit a36b016 into develop Aug 28, 2019
@jmiranda jmiranda deleted the OBPIH-2220 branch August 28, 2019 18:44
@dbienkowska
Copy link
Collaborator Author

@jmiranda Sorry, forgot to respond last time. Yes, we're using interactive rebase with a force push.
Command that I'm usually using to squash two commits is git rebase -i HEAD~2 and then use command fixup - it's like squash but it discards log message. Then just save changes, force push and voilà :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants