Git Merge Conflicts: Android Programming

Please login in order to report media.

  • Uploaded 9 months ago in the category How to programming

    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.
    Support videos via Patreon:

    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

  • gitmergeconflicts:androidprogramming