Timeline for Is there some kind of 'git rebase --dry-run', which would notify me of conflicts in advance?
Current License: CC BY-SA 3.0
15 events
| when toggle format | what | by | license | comment | |
|---|---|---|---|---|---|
| Sep 15, 2023 at 6:36 | answer | added | Cukiernik | timeline score: -1 | |
| Mar 3, 2020 at 19:49 | answer | added | isapir | timeline score: 6 | |
| Jan 5, 2018 at 15:40 | answer | added | joneit | timeline score: 52 | |
| May 30, 2017 at 14:58 | comment | added | jordanpg | For messy rebases, I often create a new branch and do a trial run there first. If everything goes smoothly, the the trial run becomes the rebase, otherwise just switch back to the original branch. | |
| Dec 9, 2016 at 13:48 | answer | added | Lukasz Kruszyna | timeline score: 5 | |
| Jan 14, 2016 at 16:32 | answer | added | Kryten | timeline score: 9 | |
| Oct 10, 2015 at 22:41 | vote | accept | Jonathan.Brink | ||
| Oct 10, 2015 at 16:57 | history | edited | jub0bs |
edited tags
|
|
| Oct 10, 2015 at 16:49 | history | edited | jub0bs | CC BY-SA 3.0 |
improve title
|
| Oct 10, 2015 at 13:55 | answer | added | jub0bs | timeline score: 84 | |
| Jul 9, 2015 at 15:35 | comment | added | Jonathan.Brink | @crmpicco I basically did what Jubobs suggested by going ahead with the rebase, checking for conflict, and aborting if needed. I wish there was a more elegant way however... | |
| Jul 8, 2015 at 14:07 | comment | added | crmpicco | Did you find a way of doing this? | |
| Apr 8, 2015 at 15:15 | comment | added | jub0bs |
If you run git rebase and hit a merge conflict, the process will stop and exit with a nonzero status. You could check the exit status of the rebase operation, and, if it is nonzero, run git rebase --abort to cancel the operation.
|
|
| Apr 8, 2015 at 15:13 | comment | added | jub0bs |
What is the exact form of the git rebase command you're using? Are you using any optional flags? And what scripting language are you using? Shell?
|
|
| Apr 8, 2015 at 14:23 | history | asked | Jonathan.Brink | CC BY-SA 3.0 |