-
|
After resolving merge issues on the conflicting-master-XXXXX branch, the app does not seem to be able to track master again. Instead, its still stuck on conflicting-master-XXXX according to "Local Git config & utilities". It is not clear to me whether this is expected or not (the branch name seems to imply not) |
Beta Was this translation helpful? Give feedback.
Replies: 2 comments 2 replies
-
|
What version of the app are you on? |
Beta Was this translation helpful? Give feedback.
-
|
1.13.5 from the Play Store I believe |
Beta Was this translation helpful? Give feedback.
-
|
I can't remember if the stable build is supposed to have a UI for it but the crude solution for it is to use the 'Delete repository' option in settings and then clone the repo again, provided you've resolved the conflicts on the remote and there's nothing on the device that has not been synced out. I've made a note to improve the user experience around this for the v2.0.0 release. |
Beta Was this translation helpful? Give feedback.
-
|
Was hoping i wouldnt have to resolve to that, the option does exist so ill just do that then. |
Beta Was this translation helpful? Give feedback.
1.13.5 from the Play Store I believe