https://github.com/9elements/academy-merge-conflict

Learn how to resolve a merge conflict in different ways.
https://github.com/9elements/academy-merge-conflict

Last synced: 4 months ago
JSON representation

Learn how to resolve a merge conflict in different ways.

• Host: GitHub
• URL: https://github.com/9elements/academy-merge-conflict
• Owner: 9elements
• Created: 2014-06-11T23:03:17.000Z (about 11 years ago)
• Default Branch: master
• Last Pushed: 2014-06-11T23:50:38.000Z (about 11 years ago)
• Last Synced: 2025-02-16T19:09:47.264Z (4 months ago)
• Language: CSS
• Size: 227 KB
• Stars: 1
• Watchers: 6
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md

Awesome Lists containing this project

README

        
# Resolving merge conflicts

In this git repository you'll learn how to resolve a merge conflict.

Checkout all branches

* master

* tobi

* felix

And take a look at all commits to understand what has been done.

Now merge the "master" with "tobi":

    git checkout master

    git merge tobi

Now merge the "master" with "felix":

    git checkout master

    git merge felix

Happy merge conflict fixing.

Now reset master to the "starting-point"

    git checkout starting-point

    git rebase tobi

    git rebase felix

Happy merge conflict fixing.

Understand when you can safely use git push and when you have

to use git push -f.

Understand what git push -f means for your coworkers.

Bonus round:

    git merge strangedude

    git rebase strangedude