1. Home
2. Questions
3. Tags
5. Users
6. Companies
7. Labs
8. Jobs
9. Discussions
10. Collectives
11. Communities for your favorite technologies. Explore all Collectives
Teams

Now available on Stack Overflow for Teams! AI features where you work: search, IDE, and chat.
Learn more Explore Teams
Teams
Ask questions, find answers and collaborate at work with Stack Overflow for Teams. Explore Teams

Return to Question

edited tags

Link

edited Oct 10, 2015 at 16:57

64.5k
26
191
193

git rebase git-rebase git-merge-conflict

improve title

Link

edited Oct 10, 2015 at 16:49

64.5k
26
191
193

git Is there some kind of 'git rebase --dry-runrun', which would notify me of conflicts in advance? Know if there is a conflict before performing rebase

Source Link

asked Apr 8, 2015 at 14:23

24.8k
20
79
122

git rebase --dry-run? Know if there is a conflict before performing rebase

I'm trying to script rebasing and my script will take different paths depending on if the rebase results in any conflicts.

Is there a way to determine if a rebase would result in conflicts before executing the rebase?

git rebase