-
- (api-reachout) sankalps-MacBook-Air:pstack-rsearch-apis sankalp$ git checkout master
- Switched to branch 'master'
- Your branch is up-to-date with 'origin/master'.
- (api-reachout) sankalps-MacBook-Air:pstack-rsearch-apis sankalp$ git pull
- Already up-to-date.
- (api-reachout) sankalps-MacBook-Air:pstack-rsearch-apis sankalp$ git fetch
- (api-reachout) sankalps-MacBook-Air:pstack-rsearch-apis sankalp$ git checkout sankalp_dev
- Switched to branch 'sankalp_dev'
- Your branch is up-to-date with 'origin/sankalp_dev'.
- (api-reachout) sankalps-MacBook-Air:pstack-rsearch-apis sankalp$ git pull origin master
- From https://bitbucket.org/abansriyar/pstack-rsearch-apis
- * branch master -> FETCH_HEAD
- Auto-merging api_parallelstack_com/settings.py
- CONFLICT (content): Merge conflict in api_parallelstack_com/settings.py
- Auto-merging api_parallelstack_com/apps/rsearch/libs/RSearchModels.py
- CONFLICT (content): Merge conflict in api_parallelstack_com/apps/rsearch/libs/RSearchModels.py
- Automatic merge failed; fix conflicts and then commit the result.
- (api-reachout) sankalps-MacBook-Air:pstack-rsearch-apis sankalp$ git status
- On branch sankalp_dev
- Your branch is up-to-date with 'origin/sankalp_dev'.
- You have unmerged paths.
- (fix conflicts and run "git commit")
- (use "git merge --abort" to abort the merge)
-
- Changes to be committed:
-
- modified: api_parallelstack_com/apps/rsearch/middleware/auth_middleware.py
- modified: api_parallelstack_com/apps/rsearch/middleware/logging_middleware.py
- modified: api_parallelstack_com/apps/rsearch/views.py
-
- Unmerged paths:
- (use "git add <file>..." to mark resolution)
-
- both modified: api_parallelstack_com/apps/rsearch/libs/RSearchModels.py
- both modified: api_parallelstack_com/settings.py
-