Created
October 17, 2024 21:22
-
-
Save Icehunter/fa9ce6f00763b629a604a6b7f8ba4c20 to your computer and use it in GitHub Desktop.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Guys, this is getting really frustrating. **We need to stop committing directly to the `dev` branch**. Every time someone does this, the project gets out of sync, and now every `git pull` leads to these ridiculous merge commits that we shouldn’t have to deal with. It’s causing a ton of unnecessary conflicts and wasting everyone’s time. | |
We’ve talked about this before—use **feature branches**. It’s not hard, and it keeps things clean. If this keeps happening, we’re just going to keep running into the same issues, and the project will be a mess. Let’s get it together. | |
If you’re not sure how to use Git correctly or need a refresher, check out these resources: | |
1. **Git Branching Basics**: | |
A comprehensive guide by Atlassian on how to use Git branches for better project organization. | |
[Atlassian Git Branching](https://www.atlassian.com/git/tutorials/using-branches) | |
2. **Understanding Git Merge vs. Rebase**: | |
This article explains when to use `merge` and `rebase` and how they differ. | |
[Git Merge vs. Rebase](https://www.atlassian.com/git/tutorials/merging-vs-rebasing) | |
3. **Git Best Practices**: | |
GitHub's guide on best practices, including using pull requests, feature branches, and clean commit histories. | |
[GitHub Git Best Practices](https://github.com/trein/dev-best-practices/wiki/Git) | |
4. **Pro Git Book**: | |
A free, in-depth guide to Git that covers branching, collaboration workflows, and more advanced topics. | |
[Pro Git Book](https://git-scm.com/book/en/v2) | |
5. **Why You Should Use Feature Branches**: | |
An article explaining the importance of feature branches and how they prevent messy conflicts. | |
[Feature Branching Explained](https://www.gitkraken.com/learn/git/feature-branch) | |
Please take the time to review these so we can avoid these problems moving forward. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment