Skip to main content

How To Use Git in Netbeans

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 development process easier because it has been integrated with the IDE.

Create Remote Git Repository
We need remote Git repository so everyone can store or receive any revision or updated files through the networks. We can setup our own Git server or use 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 which will be stored to remote repository. We also need to create local repository before we can push any revision and files to remote repository.
1. Create a project. For example, I create PHP Application project and add some files.
Create PHP Application in Netbeans
Add some files in the project

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

Commit to Local Repository and Push to Remote Repository
1. After you make some changes or add some files in repository, you can commit changes to local repository (Git > Commit).
Commit to Local Git Repository

2. Then push the updated repository to 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 master data of a running software is not break 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, developer commit changes to that branch before senior developer validate and merge the branch to master branch.
1. Create a branch (Git > Branch/Tag > Create Branch). This process will copy master branch revision into the new branch.
Create a Branch

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

3. Now, every changes you made in the code will be stored to the new branch. Don't forget to commit and push the revision to repository. Choose "Push to Upstream" if you just want to push to 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 work in Feature#2. Both Feature#1 and Feature#2 are copied from master revision. Before you and your friend merge to master branch, you can merge your branch to your friend branch first.
1. Switch to 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
For this example, first I delete my last example project in Netbeans and also the file directory from local computer. I will download again the project data from 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 cloned.
4. Choose branch that will be checkout as your base code.
Checkout a Branch as Your Project

5. Because in remote repository there is Netbeans project files, 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 remote repository, just choose Git > Remote > Pull or Pull from Upstream for default remote repository.

~ Luki Bangun Subekti

Comments

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

    ReplyDelete

Post a Comment

Popular posts from this blog

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

Raspberry Pi Bluetooth Connection

Raspberry Pi 3 provides built-in bluetooh module. Latest Raspbian has been bundled with tools for enabling bluetooth connection. Bluetooth icon will be showed up on 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 make a connection especially for bluetooth device which has no standarized services. From terminal, we can use bluetoothctl tool to scan and connect with a bluetooth device. You should make sure that 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 device has not pair

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

Itachi Uchiha

The Real Hero of Konoha

Run Python Scripts Using PHP in a Linux Environment

How to run python or other scripts using PHP or other popular web programming languages in a Linux environment? Problem We want to access PHP program through a web server application (Apache/Nginx). The PHP program need to run other scripts stored in the same machine. Sample Problem PHP program is located in /var/www/html/index.php Python program is located in /var/www/html/capture.py Python program will access Pi Camera, capture an image, and store it in /var/www/html/assets/photo.jpg Solution index.php should access and run capture.py script. The script is as follows: $output = shell_exec("python /var/www/html/capture.py"); Execution of external program using shell_exec() or exec() will block the program. The next line of PHP codes will be run after external program returns an output. So, we shouldn't run excessive amount of external program. Clients will wait too long on their browser. If our application actually need many external pr