https://github.com/mahammad-mostafa/git-flow-conflict-exercise

This is the sixth project in the second module in the Microverse program. It is an exercise for practicing Git merge conflicts with GitFlow workflow.
https://github.com/mahammad-mostafa/git-flow-conflict-exercise

gitflow gitflow-workflow merge-conflicts

Last synced: 1 day ago
JSON representation

This is the sixth project in the second module in the Microverse program. It is an exercise for practicing Git merge conflicts with GitFlow workflow.

• Host: GitHub
• URL: https://github.com/mahammad-mostafa/git-flow-conflict-exercise
• Owner: mahammad-mostafa
• License: mit
• Created: 2023-07-25T00:17:57.000Z (over 1 year ago)
• Default Branch: development
• Last Pushed: 2023-07-25T02:27:00.000Z (over 1 year ago)
• Last Synced: 2024-10-19T03:02:25.393Z (3 months ago)
• Topics: gitflow, gitflow-workflow, merge-conflicts
• Homepage:
• Size: 9.77 KB
• Stars: 0
• Watchers: 1
• Forks: 0
• Open Issues: 0
• Metadata Files:
  • Readme: README.md
  • License: LICENSE.md

Awesome Lists containing this project

README

        


# 🏷️ Git Flow Conflict Exercise

This is an exercise for practicing `Git merge conflicts` using `GitFlow` workflow in the second module in the **Microverse** program.




Check the below contents for further details about this project.

# 📗 Contents

- [Description](#description)

- [Instructions](#instructions)

- [Authors](#authors)

- [Contributions](#contributions)

- [Support](#support)

- [Acknowledgements](#acknowledgements)

- [License](#license)



# 📖 Description

This project is a basic plain test files used to create merge conflicts.

It is intended for practicing resolving merge conflicts using `GitFlow` workflow.

Three text files are used (`programmer.txt` / `simplicity.txt` / `solve.txt`).

📌 **Key Features:**

- Very simple text files with quotes

- Two conflicting branches created

- Merge conflict resolved on `add-quotes` branch

 

back to top




# 🛠️ Instructions

- You can easily download or fork this repository and work on it immadiately!

- No requirements or prerequisites are needed

back to top




# 👥 Authors

📌 **Mahammad:**

- [GitHub](https://github.com/mahammad-mostafa)

- [Twitter](https://twitter.com/mahammad_mostfa)

- [LinkedIn](https://linkedin.com/in/mahammad-mostafa)

back to top




# 🤝🏻 Contributions

Wish to contribute to this project?




Contributions, issues, and feature requests are more than welcome!




Feel free to check the [issues](../../issues) page too.

back to top




# ⭐️ Support

Like this project? Show your support by starring!

back to top




# 🙏🏻 Acknowledgements

I thank everyone at **Microverse** for guiding me through this project.

back to top




# 📝 License

This project is [MIT](LICENSE.md) licensed.

back to top