You're on your way to the next level! Join the Kudos program to earn points and save your progress.
Level 1: Seed
25 / 150 points
Next: Root
1 badge earned
Challenges come and go, but your rewards stay with you. Do more to earn more!
What goes around comes around! Share the love by gifting kudos to your peers.
Keep earning points to reach the top of the leaderboard. It resets every quarter so you always have a chance!
Join now to unlock these features and more
The Atlassian Community can help you and your team get more value out of Atlassian products and practices.
If a rebase generates conflicts that have to be manually resolved, how do I continue the rebase after resolving the conflicts?
I can do this from the terminal with `git rebase --continue`, but while stuff I read only line says I just need to do a commit I get a warning that the commit message is empty.
Is that not possible with source tree?
Platform: OS X 10.9.5
SourceTree: 2.0.0
Yes the option is there, but it throws an error message
git -c diff.mnemonicprefix=false -c core.quotepath=false --no-optional-locks -c lfs.customtransfer.bitbucket-media-api.path=git-lfs-bitbucket-media-api -c sequence.editor='C:\Users\patrick.little\AppData\Local\SourceTree\app-3.3.9\tools\stree_gri' -c core.editor='C:\Users\patrick.little\AppData\Local\SourceTree\app-3.3.9\tools\stree_gri' rebase --continue
error: There was a problem with the editor ''C:\Users\patrick.little\AppData\Local\SourceTree\app-3.3.9\tools\stree_gri''.
Please supply the message using either -m or -F option.
error: could not commit staged changes.
Completed with errors, see above.
Using 'git rebase --continue' from the terminal works fine.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
That option is greyed out for me, does that mean my rebase is complete?
I thought that was the case, but vscode put * + (Rebasing) behind the branch name that the repository is on.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.
You must be a registered user to add a comment. If you've already registered, sign in. Otherwise, register and sign in.