nah nantinya agar sebuah project yang kita kerjakan tidak terjadi konflik dengan teman yang lain maka ada sebuah pilihan yaitu forking project dengan fork kita mengerjakan sebuah bagian kita sendiri didalam sebuah project menambahkan code pada activity tertentu. menambahkan activity baru dan lain lain.
salinan repositori asli yang dapat Anda masukkan ke dalam ruang nama lain tempat Anda dapat melakukan percobaan dan menerapkan perubahan yang nantinya dapat Anda putuskan jika menerbitkan atau tidak, tanpa mempengaruhi proyek asli Anda.
lihat selengkapnya di gitlab fork
terminal dijalankan di dalam folder project android studio jalankan perintah git remote -v
origin https://gitlab.com/username/project.git (fetch)
origin https://gitlab.com/username/project.git (push)
remote -v ditujukan untuk melihat remote originnya yang mengarah ke file hasil fork
,
kali ini kita tambahkan upsteam untuk pull pada project
git remote add upstream
https://gitlab.com/username/project.git
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
remote -vorigin https://gitlab.com/walageri/bla.git (fetch)
origin https://gitlab.com/walageri/bla.git (push)
upstream https://gitlab.com/myfriends/bla.git (fetch)
upstream https://gitlab.com/myfriends/bla.git (push)
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch
* master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch gery
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
remote -vorigin https://gitlab.com/walageri/bla.git (fetch)
origin https://gitlab.com/walageri/bla.git (push)
upstream https://gitlab.com/myfriends/bla.git (fetch)
upstream https://gitlab.com/myfriends/bla.git (push)
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch
gery
* master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch chekout gery
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch
chekout
gery
* master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
chekout gery
git: 'chekout' is not a git command. See 'git --help'.
Did you mean this?
checkout
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
checkout gery
Switched to branch 'gery'
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch chekout
* gery
master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch
chekout
* gery
master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
status
On branch gery
Changes not staged for commit:
(use "git add
<file>..." to update what will be committed)
(use "git
checkout -- <file>..." to discard changes in working directory)
modified: .idea/misc.xml
modified: app/src/main/java/com/myfriends/bla/LoginActivity.java
modified: app/src/main/java/com/myfriends/bla/MainActivity.java
modified: app/src/main/res/layout/activity_login.xml
modified: app/src/main/res/values/dimens.xml
modified: app/src/main/res/values/strings.xml
Untracked files:
(use "git add
<file>..." to include in what will be committed)
app/src/main/java/com/myfriends/bla/SosMed.java
app/src/main/res/drawable/edtbg.xml
app/src/main/res/layout/sos_med.xml
no changes added to commit (use "git add" and/or
"git commit -a")
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
add app/src/main/java/com/myfriends/bla/LoginActivity.java
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git add
app/src/main/java/com/myfriends/bla/MainActivity.java
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git add
app/src/main/res/layout/activity_login.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git add
app/src/main/res/values/dimens.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
add app/src/main/res/values/strings.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
status
On branch gery
Changes to be committed:
(use "git reset
HEAD <file>..." to unstage)
modified: app/src/main/java/com/myfriends/bla/LoginActivity.java
modified: app/src/main/java/com/myfriends/bla/MainActivity.java
modified: app/src/main/res/layout/activity_login.xml
modified: app/src/main/res/values/dimens.xml
modified: app/src/main/res/values/strings.xml
Changes not staged for commit:
(use "git add
<file>..." to update what will be committed)
(use "git
checkout -- <file>..." to discard changes in working directory)
modified: .idea/misc.xml
Untracked files:
(use "git add
<file>..." to include in what will be committed)
app/src/main/java/com/myfriends/bla/SosMed.java
app/src/main/res/drawable/edtbg.xml
app/src/main/res/layout/sos_med.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git add
app/src/main/java/com/myfriends/bla/SosMed.java
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git add
app/src/main/res/drawable/edtbg.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git add
app/src/main/res/layout/sos_med.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
status
On branch gery
Changes to be committed:
(use "git reset
HEAD <file>..." to unstage)
modified: app/src/main/java/com/myfriends/bla/LoginActivity.java
modified: app/src/main/java/com/myfriends/bla/MainActivity.java
new file: app/src/main/java/com/myfriends/bla/SosMed.java
new file: app/src/main/res/drawable/edtbg.xml
modified: app/src/main/res/layout/activity_login.xml
new file: app/src/main/res/layout/sos_med.xml
modified: app/src/main/res/values/dimens.xml
modified: app/src/main/res/values/strings.xml
Changes not staged for commit:
(use "git add
<file>..." to update what will be committed)
(use "git
checkout -- <file>..." to discard changes in working directory)
modified: .idea/misc.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
checkout -- .idea/misc.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
statusOn branch gery
Changes to be committed:
(use "git reset HEAD
<file>..." to unstage)
modified: app/src/main/java/com/myfriends/bla/LoginActivity.java
modified: app/src/main/java/com/myfriends/bla/MainActivity.java
new file: app/src/main/java/com/myfriends/bla/SosMed.java
new file: app/src/main/res/drawable/edtbg.xml
modified: app/src/main/res/layout/activity_login.xml
new file: app/src/main/res/layout/sos_med.xml
modified: app/src/main/res/values/dimens.xml
modified: app/src/main/res/values/strings.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
commit -m "edit login dan sosmed "
[gery 40f03f3] edit login dan sosmed
8 files changed, 489
insertions(+), 18 deletions(-)
create mode 100644
app/src/main/java/com/myfriends/bla/SosMed.java
create mode 100644
app/src/main/res/drawable/edtbg.xml
create mode 100644
app/src/main/res/layout/sos_med.xml
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
status
On branch gery
nothing to commit, working directory clean
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
remote -v
origin https://gitlab.com/walageri/bla.git (fetch)
origin https://gitlab.com/walageri/bla.git (push)
upstream https://gitlab.com/myfriends/bla.git (fetch)
upstream https://gitlab.com/myfriends/bla.git (push)
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch
chekout
* gery
master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git push
origin gery
Username for 'https://gitlab.com': walageri
Password for 'https://walageri@gitlab.com':
Counting objects: 21, done.
Delta compression using up to 4 threads.
Compressing objects: 100% (18/18), done.
Writing objects: 100% (21/21), 4.05 KiB | 0 bytes/s, done.
Total 21 (delta 12), reused 0 (delta 0)
remote:
remote: To create a merge request for gery, visit:
remote:
https://gitlab.com/walageri/bla/merge_requests/new?merge_request%5Bsource_branch%5D=gery
remote:
To https://gitlab.com/walageri/bla.git
* [new branch] gery -> gery
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch
chekout
* gery
master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
checkout master
Switched to branch 'master'
Your branch is up-to-date with 'origin/master'.
gery@gery-Satellite-A~/AndroidStudioProjects/bla $ git
branch chekout
gery
* master
gery@gery-Satellite-A~/AndroidStudioProjects/bla $
Tidak ada komentar:
Posting Komentar