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

Deliver SaaS According Twelve-Factor App

If you haven't heard of  the twelve-factor app , it gives us a recommendation or a methodology for developing SaaS or web apps structured into twelve items. The recommendation has some connections with microservice architecture and cloud-native environments which become more popular today. We can learn the details on its website . In this post, we will do a quick review of the twelve points. One Codebase Multiple Deployment We should maintain only one codebase for our application even though the application may be deployed into multiple environments like development, staging, and production. Having multiple codebases will lead to any kinds of complicated issues. Explicitly State Dependencies All the dependencies for running our application should be stated in the project itself. Many programming languages have a kind of file that maintains a list of the dependencies like package.json in Node.js. We should also be aware of the dependencies related to the pla...
2 comments
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 / (1...
7 comments
Read more

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...
3 comments
Read more

Deploying a Web Server on UpCloud using Terraform Modules

In my earlier post , I shared an example of deploying UpCloud infrastructure using Terraform from scratch. In this post, I want to share how to deploy the infrastructure using available Terraform modules to speed up the set-up process, especially for common use cases like preparing a web server. For instance, our need is to deploy a website with some conditions as follows. The website can be accessed through HTTPS. If the request is HTTP, it will be redirected to HTTPS. There are 2 domains, web1.yourdomain.com and web2.yourdomain.com . But, users should be redirected to "web2" if they are visiting "web1". There are 4 main modules that we need to set up the environment. Private network. It allows the load balancer to connect with the server and pass the traffic. Server. It is used to host the website. Load balancer. It includes backend and frontend configuration. Dynamic certificate. It is requ...
Post a Comment
Read more

Why Hashicorp Vault Can Be Important

As I have been working on many software projects and teams, I see that sharing credentials among developers is a common thing. Sometimes, developers store credentials in a file where everyone in the team can access them just to streamline the development process. But, I was also wondering how to maintain the security of the software or data managed while the credentials are accessible to everyone. How can we monitor the usage, make sure that no one in the team uses the credentials differently than they're supposed to be, or renew the credentials with ease? Hashicorp Vault is one of the solutions in the market that can answer that question. There are three main problems that Vault solves. The first is called secret sprawl where the credentials are spread everywhere to many individuals. Then, it becomes difficult when someone leave the team and we have to renew the existing credentials to secure the access. Vault can provide a mechanism to centralize the credentials storage, p...
Post a Comment
Read more

Manage Kubernetes Cluster using Rancher

Recently, I sought a simpler method to deploy and maintain Kubernetes clusters across various cloud providers. The goal was to use it for development purposes with the ability to manage the infrastructure and costs effortlessly. After exploring several options, I decided to experiment with Rancher. Rancher offers a comprehensive software stack for teams implementing container technology. It tackles both the operational and security hurdles associated with managing numerous Kubernetes clusters. Additionally, it equips DevOps teams with integrated tools essential for managing containerized workloads. Rancher also offers an open-source version, allowing free deployment within one's infrastructure. The Rancher platform can be deployed either as a Docker container or within a Kubernetes cluster utilizing the K3s engine. We can read the documentation on how to install Rancher on K3s using Helm . Rancher itself enables the creation and provisioning of Kubernetes clusters and ...
Post a Comment
Read more