Friday, 11 June 2021

Using Meld for a 3-way merge

meld is available on Ubuntu via standard package manager:
 
$ sudo apt-get update && $ sudo apt-get install meld




There is a conflict in file test.txt on branch feature which we want to merge to dev.

$ git checkout dev
 
$ git merge feature
Auto-merging test.txt
CONFLICT (content): Merge conflict in test.txt
Automatic merge failed; fix conflicts and then commit the result.
 
$ git config merge.tool meld
 
$ git mergetool
Merging:
test.txt

Normal merge conflict for 'test.txt':
  {local}: modified file
  {remote}: modified file
test.txt seems unchanged.
Was the merge successful [y/n]? n
merge of test.txt failed
 
$ git status
On branch dev
Your branch is up-to-date with 'origin/dev'.

You have unmerged paths.
  (fix conflicts and run "git commit")
  (use "git merge --abort" to abort the merge)

...
Unmerged paths:
  (use "git add <file>..." to mark resolution)
    both modified:   test.txt
...


 

8 comments:

micheal pan said...

BE SMART AND BECOME RICH IN LESS THAN 3DAYS....It all depends on how fast 
you can be to get the new PROGRAMMED blank ATM card that is capable of
hacking into any ATM machine,anywhere in the world. I got to know about 
this BLANK ATM CARD when I was searching for job online about a month 
ago..It has really changed my life for good and now I can say I'm rich and 
I can never be poor again. The least money I get in a day with it is about 
$50,000.(fifty thousand USD) Every now and then I keeping pumping money 
into my account. Though is illegal,there is no risk of being caught 
,because it has been programmed in such a way that it is not traceable,it 
also has a technique that makes it impossible for the CCTVs to detect 
you..For details on how to get yours today, email the hackers on : (
atmmachinehackers1@gmail.com ). Tell your 
loved once too, and start to live large. That's the simple testimony of how 
my life changed for good...Love you all ...the email address again is ;
atmmachinehackers1@gmail.com

Shivam shakya said...
This comment has been removed by the author.
Suraj said...
This comment has been removed by the author.
Suraj said...
This comment has been removed by the author.
Suraj said...

Hello, Sir,
You have explained all the features very great in this using Meld for 3-way merge, I will definitely share this article with my friends. If you want to know more about hosting USA VPS hosting, I will be pleased to tell thou.

Shivam shakya said...

Nice article about "Using Meld for a 3-way merge" is informative for all of us. If you want to know about Server Hosting or interested in the best USA VPS Hosting you can ask us for more details and services.

Robert Earl said...

CAN I RECOVER BACK MY LOST FUNDS FROM A SCAMMER?
How to recover your money from fake brokers, fake bitcoin investment platforms, forex schemes, binary, false investments proposals.
I lost my hard earned money on a fake website. Claiming high return on investment after a monetary space of two days. I invested in their website. After which I couldn't gain any access to my capital and profits after 48 hours, I asked why I could not receive my money, then i was told to make an additional deposit of $26,000 for a dumb reason I couldn't remember. That was when I knew there was something wrong. I am a policeman with two beautiful daughters, lost my wife few years ago, which I promised myself I was going to do all I could to take care of my kids after the demise of my wife. But falling for such scam for acquisitive reason and puting my children's future at risk was quite unwelcoming. I went broke afterwards. During the course of trying to redeem myself after few months of getting scammed, i met with a referral on reddit who navigated me to a hacker on the internet. I patiently took some time to comprehend the core activities of this profound hackers. The Globalkos is a vulnerability coordination agency that performs a hack penetration guage to provides wealth recovery services for individuals and companies who have lost money through fraudulent online platforms. This organization was able to help me recover my lost bitcoins. I am truly pleased with the works of this hackers. If you really need to recover back your lost funds, contact theglobalkos@gmail.com or fundsrecovery.teams@gmail.com.
However, You can stay away from false businesses online surely to be highly oned firm by making enquiries for their firm reference number (FRN) and contact details and barter their calls on the switchboard number and also never make use of the link in a website or an email from the firm propitiating you for an investment.

NoveltyDMVExperts said...

Hi there, I found your website by means of Google while looking for a
similar matter, your site got here up, it looks great. I have bookmarked it in my google bookmarks. BLUE COOKIES MEDICAL KUSH FOR ALL I have got you bookmarked to look at new stuff you .