Allow to preserve merges on rebase
By var... on September 29, 2014 15:44 (imported from Google Code)
What steps will reproduce the problem?
- You are working in a branch on busy production repository
- Pull remote changes and create a merge commit into master
- Push
- Someone has done commits in master on remote site and push is declined
- Open Sync
- You cannot do Fetch&Rebase to redo your work over theirs now, so you have to reset, checkout, pull, merge again and cross fingers that there is no one out there that has done other commits.
What is the expected output? What do you see instead?
If "Fetch&Rebase" has "--preserve-merges" GIT option on rebase command, the life will be much easier.
What version of TortoiseGit and msysgit are you using? On
what operating system?
1.8.11 on Win 8.1 x64
Please provide any additional information below.
To upload designs, you'll need to enable LFS and have admin enable hashed storage. More information