DEV Community

Discussion on: What is your favourite git merge tool/strategy?

Collapse
 
itsdarrylnorris profile image
Darryl Norris • Edited

This is the best way to merge in Git.

#### FYI: DO NOT RUN THESE COMMANDS. This will not merge instead it will force a pushed commit.

git add -f . && \ 
git commit -m "`curl -s http://whatthecommit.com/index.txt`" && \
git push -f


FYI: DO NOT RUN THESE COMMANDS. This will not merge instead it will force a pushed commit.

Collapse
 
qm3ster profile image
Mihail Malo

This is pretty bad, maybe copy the warning to above the code as well.

And into the code as a comment, for good measure.

Collapse
 
itsdarrylnorris profile image
Darryl Norris

Done

Collapse
 
flexdinesh profile image
Dinesh Pandiyan

I see what you did there 🔥

Collapse
 
itsdarrylnorris profile image
Darryl Norris

hahahah