git pull --rebase

❓ Information

• when someone changed the same file as me and pushed first
• don’t git pull do git pkull --rebase

---

❗ Relevant data

📦 Information Resources

youtube: Never use git pull

🔰 Content ->

1. Always try git pull —rebase first
   If it works, you’re done!
2. If you get a merge conflict, you can undo everything with git rebase —abort
3. Just pull normally using git pull, or do an interactive rebase (advanced)