Skip to main content

How To Use Git in Netbeans

Image
Git is a popular version control application nowadays. Recently I have created a note about its differences with SVN and how to use it in Eclipse. There are many Git client tools. But I just want to show how to use Netbeans built-in Git tools. It makes the development process easier because it has been integrated with the IDE.

Create Remote Git Repository
We need a remote Git repository so everyone can store or receive any revision or updated files through the networks. We can set up our own Git server or use a public Git server like Github. In this note, I use Github.
1. Create an account in Github and create an empty Git repository
Create an empty public repository in Github

2. Get the remote repository link
Your Github Repository URL

Create a New Project in Netbeans and Create Local Git Repository
After we have a remote Git repository, we can create a project stored in the remote repository. We also need to create a local repository before we can push any revisions and files to the remote repository.

1. Create a project. For example, I create a PHP Application project and add some files.
Create PHP Application in Netbeans

Add some files to the project

2. Create a local Git repository. Right-click on the project then choose Versioning > Initialize Git Repository. Set your project directory location as the root path.
Initialize Git Repository

Commit to Local Repository and Push to Remote Repository

1. After you make changes or add files to the repository, you can commit changes to the local repository (Git > Commit).
Commit to Local Git Repository

2. Then push the updated repository to the remote repository (Git > Remote > Push).
Push to Remote Git Repository

3. Complete remote repository details then choose local repository branches that will be submitted.
Remote Repository Details

4. Github repository has been updated.
Github Repository

Create Other Branches
In software development which consists of some individuals, it's important to ensure that the master data of running software is not broken when some developers make changes in the software codes. Each developer can make a branch when she wants to make some changes related to any features or bugs. Then, the developer commits changes to that branch before the senior developer validates and merges the branch to the master branch.

1. Create a branch (Git > Branch/Tag > Create Branch). This process will copy the master branch revision into the new branch.
Create a Branch

2. Switch to branch (Git > Branch/Tag > Switch to Branch). Choose the branch you want. You will see a list of branches which are available in local and remote.
Switch to a Branch

3. Now, each change you made in the code will be stored in the new branch. Don't forget to commit and push the revision to the repository. Choose "Push to Upstream" if you just want to push to the default remote repository.

Merge a Branch to Another Branch
You can merge a branch to another branch. For example, You work in Feature#1, and your friend works in Feature#2. Both Feature#1 and Feature#2 are copied from the master revision. Before you and your friend merge to the master branch, you can first merge your branch to your friend branch.

1. Switch to the branch where you work (Git > Branch/Tag > Switch to Feature#1)
2. Choose your friend branch to be merged. (Git > Branch/Tag > Merge Revision)
3. Resolve the conflict if it happened. For this example, both my friend and I make changes in index.php line 14.
Resolve Conflict

4. Commit and push the revision.

Clone Remote Repository to Local Repository
I first deleted my last example project in Netbeans and the file directory from the local computer for this example. I will download again the project data from the Github repository.

1. Get the repository URL from Github.
Get Repository URL from Github

2. Open Netbeans. In Main Menu choose Team > Git > Clone. Choose your project directory.
Clone a Github Repository

3. Choose branches that will be retrieved/cloned.
4. Choose a branch that will be checkout as your base code.
Checkout a Branch as Your Project

5. Because in the remote repository there is a Netbeans project file, Netbeans can automatically create the project for you after checkout was completed.
Import Netbeans Project

Pull Revision
If you want to update any revision from a remote repository, just choose Git > Remote > Pull or Pull from Upstream for the default remote repository.

Labels:

Comments

  1. counterpointApril 21, 2021 at 11:39 PM

    How can you tell what branch you are using while developing in netbeans?

    ReplyDelete

Post a Comment

Popular posts from this blog

Kerusakan pada Motherboard

1. Sering terjadi hang memory tidak cocok --- ganti memory ada virus di harddisk --- scan harddisk over clock --- seting kembali clock prosesor ada bad sector di harddisk --- partisi harddisk dengan benar 2. Pembacaan data menjadi lambat memori tidak cukup --- tambah memori harddisk penuh atau ada virus --- kurangi isi harddisk, scan harddisk, atau ganti hardisk 3. CMOS failure baterai habis --- ganti baterai CMOS seting BIOS berubah --- seting kembali BIOS 4. Tidak bisa booting cache memory rusak --- disable eksternal cache memory di BIOS memori tidak cocok --- ganti memori boot sector pada harddisk rusak --- masukkan operating system baru ada bad sector pada trek awal harddisk --- partisi harddisk 5. Suara bip panjang berkali-kali memori rusak --- periksa kedudukan memori memori tidak cocok --- ganti memori memori tidak masuk slot dengan sempurna --- periksa kembali kedudukan memori 6. Suara bip bagus tetapi tidak ada tampilan / bip dua kali VGA card
Post a Comment
Read more

Rangkaian Sensor Infrared dengan Photo Dioda

Keunggulan photodioda dibandingkan LDR adalah photodioda lebih tidak rentan terhadap noise karena hanya menerima sinar infrared, sedangkan LDR menerima seluruh cahaya yang ada termasuk infrared. Rangkaian yang akan kita gunakan adalah seperti gambar di bawah ini. Pada saat intensitas Infrared yang diterima Photodiode besar maka tahanan Photodiode menjadi kecil, sedangkan jika intensitas Infrared yang diterima Photodiode kecil maka tahanan yang dimiliki photodiode besar. Jika  tahanan photodiode kecil  maka tegangan  V- akan kecil . Misal tahanan photodiode mengecil menjadi 10kOhm. Maka dengan teorema pembagi tegangan: V- = Rrx/(Rrx + R2) x Vcc V- = 10 / (10+10) x Vcc V- = (1/2) x 5 Volt V- = 2.5 Volt Sedangkan jika  tahanan photodiode besar  maka tegangan  V- akan besar  (mendekati nilai Vcc). Misal tahanan photodiode menjadi 150kOhm. Maka dengan teorema pembagi tegangan: V- = Rrx/(Rrx + R2) x Vcc V- = 150 / (150+10) x Vcc V- = (150/160) x 5
4 comments
Read more

Itachi Uchiha

The Real Hero of Konoha
Post a Comment
Read more

Refund Tiket Kereta Api

Pada Desember 2013 saya telah berencana untuk pergi ke Kebumen dari Bandung menggunakan kereta api. Namun karena ada tugas yang mendesak maka saya membatalkan rencana tersebut. Tiket saya beli secara online. Pada waktu itu peraturan pembatalan pembelian tiket adalah 1 jam sebelum keberangkatan. Saya mengajukan pembatalan pada satu hari sebelum keberangkatan. Langkah-langkah pengajuan refund adalah seperti berikut. Jika Anda membeli tiket secara online, cetaklah tiket Anda terlebih dahulu di stasiun. Untuk stasiun Bandung lokasi pencetakan tiket di dekat loket Costumer Service. Pencetakan dilakukan sendiri (self service) menggunakan perangkat komputer yang disediakan dengan memasukkan kode booking pada aplikasi yang ada. Setelah itu Anda dapat bertanya pada petugas di mana loket untuk pengajuan refund. Untuk stasiun Bandung loket untuk pengajuan refund saat itu berada di loket terakhir yaitu loket 9.  Setelah menunjukkan tiket maka kita diminta mengisi formulir pengajuan pembatalan.
Post a Comment
Read more

Setting Up Next.js Project With ESLint, Typescript, and AirBnB Configuration

If we initiate a Next.js project using the  create-next-app tool, our project will be included with ESLint configuration that we can apply using yarn run lint . By default, the tool installs eslint-config-next and extends next/core-web-vitals in the ESLint configuration. The Next.js configuration has been integrated with linting rules for React and several other libraries and tools. yarn create next-app --typescript For additional configuration such as AirBnB, it is also possible. First, we need to install the peer dependencies of eslint-config-airbnb . We also add support for Typescript using eslint-config-airbnb-typescript . yarn add --dev eslint-config-airbnb eslint-plugin-import eslint-plugin-jsx-a11y eslint-plugin-react eslint-plugin-react-hooks yarn add --dev eslint-config-airbnb-typescript @typescript-eslint/eslint-plugin @typescript-eslint/parser After that, we can update the .eslintrc.json file for the new configuration. { "extends": [ "airb
Post a Comment
Read more

Raspberry Pi Bluetooth Connection

Raspberry Pi 3 provides a built-in Bluetooth module. The latest Raspbian has been bundled with tools for enabling Bluetooth connection. The Bluetooth icon will be shown up on the top right corner of the desktop. It's a tool to discover available Bluetooth devices and connect Pi with Bluetooth devices. It is easy to connect any Bluetooth-enabled electronic device with Pi. But, sometimes Pi will fail to connect, especially for Bluetooth device that has no standardized services. From a terminal, we can use the  bluetoothctl tool to scan and connect with a Bluetooth device. You should make sure that the BlueZ protocol stack has been installed by running $ apt-get install bluez Run bluetoothctl to enter the tool command window Turn the power on by running power on (Optional) You can set AutoEnable=true in /etc/bluetooth/main.conf if you want to make the Bluetooth auto power-on after reboot. Run devices to see which devices have been paired Run scan on if your desired d
3 comments
Read more