| commit | a5331d73db99c96a27e2c756b8570ad7c1a9b3f4 | |
| author | Kyle J. McKay <mackyle@gmail.com> | |
| Mon, 20 Apr 2015 21:22:34 +0000 (20 14:22 -0700) | ||
| committer | Kyle J. McKay <mackyle@gmail.com> | |
| Mon, 20 Apr 2015 21:22:34 +0000 (20 14:22 -0700) | ||
| tree | e3c77b5e3a019e24b6ccf33f3c209960c2f1b8cf | treesnapshot (tar.gz zip) |
| parent | 3f2ec330e341ec60e35a582cd6086d05a43b1cb6 | commitdiff |
tg-update: handle a conflict when merging a base
When a conflict occurs while merging a base, the user will be
left on a non-refs/heads/... branch. After resolving the merge,
committing it and then using `exit`, the following 'tg update'
command will fail because HEAD is not pointing into refs/heads/...
somewhere.
Fix this by always checking out the TopGit branch we're working
on right after the user fixes the merge conflict.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
When a conflict occurs while merging a base, the user will be
left on a non-refs/heads/... branch. After resolving the merge,
committing it and then using `exit`, the following 'tg update'
command will fail because HEAD is not pointing into refs/heads/...
somewhere.
Fix this by always checking out the TopGit branch we're working
on right after the user fixes the merge conflict.
Signed-off-by: Kyle J. McKay <mackyle@gmail.com>
| tg-update.sh | diffblobblamehistory |