Closed kingmanzhang closed 5 years ago
@jpgourdine Your commits have been merged in. Now you need to go to your terminal, cd into loinc2hpoAnnotation, checkout develop branch
git checkout develop
Pull in remote changes
git pull origin develop
Delete your branch
git branch -d jp_branch
Now, you can resume normal. In future, try your best to check in your work on time to avoid dealing with conflicts. Thanks!
@jpgourdine thanks for creating this branch. I will address it tonight. You can continue to push to your branch, or wait to use develop branch after I merge it.