Скачать или смотреть Merge Requests & Merge Conflicts: GitLab and Android Studio

GitLab workflow with feature branches and merging conflicting changes into feature branch before a merge request.

Related Videos:
GitLab feature branch and merge request without conflicts:    • GitLab Workflow: Merge Request with Androi...  
Advanced features and handling some special cases: (coming soon).


1. Android Studio: View "ME" changes:
Highlight current branch "42-my-change"
Log shows Branch
View changes

2. Android Studio: Commit
commit
push
show log
switch to "master -) origin/master"
show log

3. Merge Master to Feature
Merge master to feature when:
a) ready to merge Feature branch to master or
b) new code on master you want on feature branch.

commit (if any changse)
pull
VCS -- Git -- Merge Changes...
current: Feature (42-my-change)
Branches to merge: master (local master)
Build & test
commit
push

4. Create Merge Request on GitLab
view log: Repository -- Network : Show ME and THEM branch
Merge Request -- 'new merge request'
View merge request's changes
(If conflicts: re-do merge master to feature.)
Accept merge request
view log: Repository -- Network : Show merged to master

5. Android Studio: Update
show log
highlight branch was: 42-my-change -- remote/42-my-change
pull
show log
remove local branch: 42-my-change
[note no remote/42-my-change]
show log