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 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.

Comments

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

    ReplyDelete

Post a Comment

Popular posts from this blog

Configuring Swap Memory on Ubuntu Using Ansible

If we maintain a Linux machine with a low memory capacity while we are required to run an application with high memory consumption, enabling swap memory is an option. Ansible can be utilized as a helper tool to automate the creation of swap memory. A swap file can be allocated in the available storage of the machine. The swap file then can be assigned as a swap memory. Firstly, we should prepare the inventory file. The following snippet is an example, you must provide your own configuration. [server] 192.168.1.2 [server:vars] ansible_user=root ansible_ssh_private_key_file=~/.ssh/id_rsa Secondly, we need to prepare the task file that contains not only the tasks but also some variables and connection information. For instance, we set /swapfile  as the name of our swap file. We also set the swap memory size to 2GB and the swappiness level to 60. - hosts: server become: true vars: swap_vars: size: 2G swappiness: 60 For simplicity, we only check the exi

Installing VSCode Server Manually on Ubuntu

I've ever gotten stuck on updating the VSCode server on my remote server because of an unstable connection between my remote server and visualstudio.com that host the updated server source codes. The download and update process failed over and over so I couldn't remotely access my remote files through VSCode. The solution is by downloading the server source codes through a host with a stable connection which in my case I downloaded from a cloud VPS server. Then I transfer the downloaded source codes as a compressed file to my remote server through SCP. Once the file had been on my remote sever, I extracted them and align the configuration. The more detailed steps are as follows. First, we should get the commit ID of our current VSCode application by clicking on the About option on the Help menu. The commit ID is a hexadecimal number like  92da9481c0904c6adfe372c12da3b7748d74bdcb . Then we can download the compressed server source codes as a single file from the host.

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

Managing MongoDB Records Using NestJS and Mongoose

NestJS is a framework for developing Node.js-based applications. It provides an additional abstraction layer on top of Express or other HTTP handlers and gives developers a stable foundation to build applications with structured procedures. Meanwhile, Mongoose is a schema modeling helper based on Node.js for MongoDB. There are several main steps to be performed for allowing our program to handle MongoDB records. First, we need to add the dependencies which are @nestjs/mongoose , mongoose , and @types/mongoose . Then, we need to define the connection configuration on the application module decorator. import { MongooseModule } from '@nestjs/mongoose'; @Module({ imports: [ MongooseModule.forRoot('mongodb://localhost:27017/mydb'), ], controllers: [AppController], providers: [AppService], }) Next, we create the schema definition using helpers provided by NestJS and Mongoose. The following snippet is an example with a declaration of index setting and an o

Resize VirtualBox LVM Storage

VirtualBox is a free solution to host virtual machines on your computer. It provides configuration options for many components on our machine such as memory, storage, networking, etc. It also allows us to resize our machine storage after its operating system is installed. LVM is a volume manager in a Linux platform that helps us to allocate partitions in the system and configure the storage size that will be utilized for a specific volume group. There are some points to be noticed when we work with LVM on VirtualBox to resize our storage. These are some steps that need to be performed. 1. Stop your machine before resizing the storage. 2. Set new storage size using GUI by selecting " File > Virtual Media Manager > Properties " then find the desired virtual hard disk name that will be resized. OR , by running a CLI program located in " Program Files\Oracle\VirtualBox\VBoxManage.exe ".  cd "/c/Program Files/Oracle/VirtualBox" ./VBoxManage.exe list

How To Use Protocol Buffer in Javascript

We have understood a few advantages of protocol buffer like what I've explained in my other post . Now, let's look at how we can implement it in our code. The "transpiler" tool, named protoc , supports the generation of a helper class for managing the object instance in a variety of programming languages. In this post, we use Javascript as an example and run in a Linux environment. Preparation Before we develop our code, we should install protoc for generating the helper class. Download protoc binary from the release page . Extract the content and store the directories  ( bin  and  includes ) in /usr/local  directory so that the executable binary can be accessed directly. Run protoc --help to check its manual. Install a required dependency globally to enable protoc  to generate the Javascript files by running: npm i -g protoc-gen-js . Create a proto file First, we should create an empty directory