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

Increase of Malicious Activities and Implementation of reCaptcha

In recent time, I've seen the increase of malicious activities such as login attempts or phishing emails to some accounts I manage. Let me list some of them and the actions taken. SSH Access Attempts This happened on a server that host a Gitlab server. Because of this case, I started to limit the incoming traffic to the server using internal and cloud firewall provided by the cloud provider. I limit the exposed ports, connected network interfaces, and allowed protocols. Phishing Attempts This typically happened through email and messaging platform such as Whatsapp and Facebook Page messaging. The malicious actors tried to share a suspicious link lured as invoice, support ticket, or something else. Malicious links shared Spammy Bot The actors leverage one of public endpoint on my website to send emails. Actually, the emails won't be forwarded anywhere except to my own email so this just full my inbox. This bot is quite active, but I'm still not sure what...
Post a Comment
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

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

Kenshin VS The Assassin

It is an assassin versus assassin.
Post a Comment
Read more

Handling PDF Generation in Web Service

If we are building a website that requires a PDF generation feature, there are several options for implementing it based on the use cases or user requirements. First, we can generate the PDF on the client side using any available client library. It is suitable if the use case is to print out some data that is already available inside certain website components, and we want to maintain the styles of the components in the document. Second, we can do it fully in the back-end using any library available, such as PDF-lib, jsPDF, and so on. This approach is suitable if we want to keep the data processing or any related business functions in the back-end server. This second approach might have disadvantages, such as the difficulty of maintaining the design assets and styles which are already on our website. Third, it is using a hybrid approach, where certain processes are handled on the client side, and some are handled on the back-end. In this post, I want to discuss more about the...
Post a Comment
Read more

Free Cloud Services from UpCloud

Although I typically deploy my development environment or experimental services on UpCloud , I do not always stay updated on its announcements. Recently, I discovered that UpCloud has introduced a new plan called the Essentials plan, which enables certain cloud services to be deployed at no cost. The complimentary services are generally associated with network components or serve as the foundation for other cloud services. This feature is particularly useful when retaining foundational services, such as a load balancer, is necessary, while tearing down all services and reconfiguring the DNS and other application settings each time we temporarily clean up infrastructure to reduce costs is undesirable.  When reviewing the service specifications of the cloud services in the Essentials plan, they appear to be very similar to those in the Development plan. The difference in service levels is unclear, but it could be related to hardware or resource allocation. For instance, the loa...
Post a Comment
Read more