Samagra-Development / odk-collect-extension

ODK Collect is an Android app for filling out forms. ODK Collect Extensions is a layer on top of ODK Collect to make it easier to integrate inside existing Android apps.
https://docs.getodk.org/collect-intro
Apache License 2.0
5 stars 18 forks source link

Update PULL_REQUEST_TEMPLATE.md #23

Closed 098suraj closed 1 year ago

098suraj commented 1 year ago

Closes #21

chinmoy12c commented 1 year ago

Thanks for the PR @098suraj, please take note that future PRs should be based on Samagra-Development/odk-collect-extension's develop branch and not on getodk/collect.

098suraj commented 1 year ago

Thanks for the PR @098suraj, please take note that future PRs should be based on Samagra-Development/odk-collect-extension's develop branch and not on getodk/collect.

My bad! I failed to notice it this time. Will take care of it from the next time. Thanks @chinmoy12c for pointing this out :-)

chinmoy12c commented 1 year ago

Hey, @098suraj can you please rebase from develop and force-push your branch once?

098suraj commented 1 year ago

Hey @chinmoy12c! Rebasing led to some conflicts and unnecessary merge commits. I created a new pull request #37 based on the develop branch to keep the commit history clean. Also, I'll remember to base my next contributions on develop branch and maintain a clean commit history. Closing this one for now.