Sign in

Tech Writer With 40k+ Views | so-close-to-Medior Java Developer | Flexible Hybris Developer | En route to seniority

Resolve git conflicts in VS Code, IntelliJ, Nano, and Sourcetree

Photo by Richard Lee on Unsplash.

Conflicts Happen

You changed a file, and so did your coworker. Conflicts will happen and will probably end up on your table.

You lag behind a fast-track branch (e.g. develop), you end up with conflicts. Resolving the issues can take up to a day, so finding a way to get it done quickly is really important.

In this article, I’ve compiled five fast methods to resolve git conflicts.

1. VS Code

Stop trying to figure out solution Y, when you don’t understand problem X

Photo by Sergey Pesterev on Unsplash

You’ve had problems with files. Probably due to their file extensions. Let’s say you wanted the last three characters to determine the file type. You ask some people questions about it.

You search for code to find the last three characters. Your coworkers probably have some suggestions, so you ask them as well.

You’re stuck on your solution, without looking back at the problem.

You’ve got into the XY problem. Let’s go into the details of it.

What’s the XY Problem?

The XY problem is asking about your attempted Y solution. You should ask about actual X problem.

Let’s make a general…

The story of Oh My Git!

Photo by Tima Miroshnichenko from Pexels

There are Git beginners. There is Oh My Git! A game to learn Git today.

This is an interactive game, which learns you the basics of Git. How? By visualizing all the Git actions, the Git newbie applies.

Here’s how the Oh My Git works. And my personal opinion on each game part.

How Oh My Git! works?

You can pick from the list of possible Git actions. You pick one, and it opens a new window. This is where the actual learning happens. You can drag and drop the Git action, and the game will show how it works.

Here are the tips, a developer with 2 years of experience, uses to be on top of all the work

Photo by fauxels from Pexels

If you get one percent better each day for one year, you’ll end up thirty-seven times better by the time you’re done. — James Clear

Doing small improvements makes all the difference. You could do a thorough review of the code, stop the bug, and free up more time to spend on Medium.

You see yourself pulling and merging branches all the time? Automate. Develop scripts, and free up more time. Time to use for your wellbeing.

Here are some of the tips I’ve applied to be more productive.

1. Improve soft skills

Working with testers is hard. I’ve learned that the hard way…

Here’s what you shouldn’t assume when building software

Wrong beliefs cost. They cost a lot. A lot of time, effort, and money.

Assuming you have a good address entry process. What if you have issues with address entry?

4 in 10 shoppers abandon their cart if there’s an issue with address entry⁵.

Assuming you have a simple checkout process. What if you have a complex checkout?

11% of cart abandoners leave because the checkout process was too complex.

This is the tip of the iceberg. More unknown stats exist. All because of wrong assumptions.

Here are the 3 common myths of software engineering. These will help you avoid…

3 common Java patterns developers should know

Photo by Andrea Piacquadio from Pexels

Good Java practices improve software quality.

Here’s how developers work. The deadline is near — rush to raise the PR. PR which isn’t the best. We have more time — we fill it with work. Work which isn’t the best.

As Java developers, we should all strive to better code. This saves our job, business, and brings profit.

Bad practices happen, in the interest of time. But we should converge to better practices.

Here are the 3 practices Java developers should know.

1. Error handling

Create custom exceptions. Bring more domain information into your errors. Don’t catch generic exceptions. …

What’s the job of an SAP Hybris Developer?

Photo by Andrea Piacquadio from Pexels

SAP Hybris. SAP Commerce Cloud.

Why is it good nowadays? Why is it worth doing Hybris?

High traffic, high revenue sites, enterprise. They all use Hybris. To solve their e-commerce problems. Look at the stats for Hybris.

How did the CVE-2021–21300 git issue happen?

Photo by Brina Blum on Unsplash

We all know Git. What we don’t know? What lies beneath, and all the Git intricacies.

Recently, there was a fix for the git clonefeature. You could execute malicious code while cloning. Exploit targets vulnerabilities of delayed checkout.

Let’s go into detail.

* CVE-2021-21300:
On case-insensitive filesystems, with support for symbolic links,
if Git is configured globally to apply delay-capable clean/smudge
filters (such as Git LFS), Git could be fooled into running
remote code during a clone.[1]

Case-insensitive filesystems are NTFS, HFS+ or APFS. All these are currently used in macOS, Linux*, and Windows.

Making this an issue for the…

Here’s how to review Java code

Photo by Thirdman from Pexels

Code review impacts software quality.³ Participation in code reviews reduces the risk of bugs.³

Good review leads to fewer bugs, more expertise, and knowledge transfer.

On average, frequent code reviewers, write better code than others. That’s because they know more, and they see more code.

Your team is only as good as your weakest reviewer. — Joel Kemp

Here’s how to review Java code better.

How to review for security

Secure your services. Create robust services. Expect unexpected behavior. Create fallback for all errors.

Don’t log confidential information. Credit card information, permissions, and other sensitive data.

Don’t create exceptions holding sensitive data. This exposes sensitive…

Here’s what to do to manage work-life balance

Photo by Ekaterina Bolovtsova from Pexels

We all fail work-life balancing. Let’s face it.

You stay overtime. You work more than you’d like to. You carry work even after working hours.

Who caused a critical bug? Will my hotfix work? Will the release succeed?

Here’s what we can do to improve work-life balance.


Create a schedule. You can use the Pomodoro technique.

Create frequent breaks between work. You can work for about 2 Pomodoros, which is an hour. After an hour of work, you take a break.

Create visible goals, that you can achieve within that hour. This will create visible progress.

Progress justifies your off…

Get the Medium app

A button that says 'Download on the App Store', and if clicked it will lead you to the iOS App store
A button that says 'Get it on, Google Play', and if clicked it will lead you to the Google Play store