Brian Fraser | Git Merge Conflicts: Android Programming @DrBFraser | Uploaded 7 years ago | Updated March 01 2023
Demo how to merge conflicting changes with Git in Android Studio / IntelliJ. Covers doing the merge with commit/pull/merge/push, and with "update project"/commit/push.
Steps for pull/merge:
- Commit changes to local repo.
- Pull remote changes, triggers a merge conflict.
- Merge changes
- Commit changes to local repo.
- Push changes to remote repo.
Steps for "Update Project"
- VCS --- Update Project
- Commit
- Push
Demo how to merge conflicting changes with Git in Android Studio / IntelliJ. Covers doing the merge with commit/pull/merge/push, and with "update project"/commit/push.
Steps for pull/merge:
- Commit changes to local repo.
- Pull remote changes, triggers a merge conflict.
- Merge changes
- Commit changes to local repo.
- Push changes to remote repo.
Steps for "Update Project"
- VCS --- Update Project
- Commit
- Push