VimGolfFix the git merge conflicts
Solve the merge conflicts in the Python file
Start file
<<<<<<< HEAD
def calculate_total(items):
"""Calculate total price of items with 10% discount"""
total = sum(item['price'] for item in items)
return total * 0.9 # Apply 10% discount
=======
def calculate_total(items):
"""Calculate total price of items with tax"""
total = sum(item['price'] for item in items)
return total * 1.15 # Apply 15% tax
>>>>>>> feature/add-tax
def format_currency(amount):
<<<<<<< HEAD
"""Format amount as USD"""
return f"${amount:.2f}"
=======
"""Format amount as EUR"""
return f"€{amount:.2f}"
>>>>>>> feature/currency-update
def process_order(items):
total = calculate_total(items)
<<<<<<< HEAD
return {
'status': 'success',
'total': format_currency(total),
'items_count': len(items)
}
=======
shipping = 5.99 if total < 50 else 0
return {
'status': 'processed',
'total': format_currency(total + shipping),
'shipping': shipping
}
>>>>>>> feature/shipping
End file
def calculate_total(items):
"""Calculate total price of items with tax"""
total = sum(item['price'] for item in items)
total = total * 0.9 # Apply 10% discount
return total * 1.15 # Apply 15% tax
def format_currency(amount):
"""Format amount as EUR"""
return f"€{amount:.2f}"
def process_order(items):
total = calculate_total(items)
shipping = 5.99 if total < 50 else 0
return {
'status': 'processed',
'total': format_currency(total + shipping),
'items_count': len(items),
'shipping': shipping
}
View Diff
1d0
< <<<<<<< HEAD
3,7d1
< """Calculate total price of items with 10% discount"""
< total = sum(item['price'] for item in items)
< return total * 0.9 # Apply 10% discount
< =======
< def calculate_total(items):
9a4
> total = total * 0.9 # Apply 10% discount
11d5
< >>>>>>> feature/add-tax
14,17d7
< <<<<<<< HEAD
< """Format amount as USD"""
< return f"${amount:.2f}"
< =======
20d9
< >>>>>>> feature/currency-update
24,30d12
< <<<<<<< HEAD
< return {
< 'status': 'success',
< 'total': format_currency(total),
< 'items_count': len(items)
< }
< =======
34a17
> 'items_count': len(items),
37d19
< >>>>>>> feature/shipping
Solutions
The best way to learn is to practice. Below, you will find some of the solutions other golfers have entered. To unlock higher ranked solutions, submit your own entry which does as well or better than the solutions you can currently see - climb the ladder!
Check out these helpful resources to improve your Vim skills... Game on.
Unlock 32 remaining solutions by signing in and submitting your own entry
#33 Badita Marin-Georgian / @GeorgianBadita - Score: 765 - 11/19/24 @ 22:27
d6ji<Esc>ud5jkjjjjddjd:10<CR>ujddddddddkkjjjjddjjjddddddddddddddjjjjjjddjkkkkkkkkkkkkkOtotal = total )<BS>* 0.9 # Plly<BS><BS><BS><BS>Apply 10% dic<BS>scount<Esc>i<Esc>hhhhhhhhhhhhhhhhhhi<BS> <Esc>;w<CR>Gfgg<Esc>ggdG<50-53>def calculate_total(items):<CR> """Calculate total price of items with tax"""<CR> total = sum(item['price'] for item in items)<CR> total = total * 0.9 # Apply 10% discount<CR> return total * 1.15 # Apply 15% tax<CR><CR>def format_currency(amount):<CR> """Format amount as EUR"""<CR> return f"<0xe2><0x82><0xac>{amount:.2f}"<CR><CR>def process_order(items):<CR> total = calculate_total(items)<CR> shipping = 5.99 if total < 50 else 0<CR> return {<CR> 'status': 'processed',<CR> 'total': format_currency(total + shipping),<CR> 'items_count': len(items),<CR> 'shipping': shipping<CR> }<Esc>[201~<Esc>;<Esc>l<Esc>;<Esc><Esc>;:w<CR>:q<CR>
0 comments
