You signed in with another tab or window. Reload to refresh your session.You signed out in another tab or window. Reload to refresh your session.You switched accounts on another tab or window. Reload to refresh your session.Dismiss alert
I was trying my babysteps of understanding how git works, I now understand how conflict resolution works on laptop (*i have a suggestion at the bottom) but for iPad it seems file in local and remote repositories are not shown, only in the local repo. there is no "<<<<<<<<< HEAD ====== >>>>>" things.
Interestingly when i click commit-and-sync one more time, my ipad gets pushed to remote. I think this happened on my android phone as well which cause me to uninstall that plugin as it messed with my remote repo. TIA
*suggestion for conflict resolution: a better format would
<<<<<File Change in local
insert the actual file changes
<<<<<File Change in remote
insert the actual file changes
reason is ==== and >>>> are already text modifiers/markdown syntaxes so it gets really confusing for first timers like me to understand how to resolve.
reacted with thumbs up emoji reacted with thumbs down emoji reacted with laugh emoji reacted with hooray emoji reacted with confused emoji reacted with heart emoji reacted with rocket emoji reacted with eyes emoji
Uh oh!
There was an error while loading. Please reload this page.
-
Hey Vinzent+other maintainers, love your works.
I was trying my babysteps of understanding how git works, I now understand how conflict resolution works on laptop (*i have a suggestion at the bottom) but for iPad it seems file in local and remote repositories are not shown, only in the local repo. there is no "<<<<<<<<< HEAD ====== >>>>>" things.
Interestingly when i click commit-and-sync one more time, my ipad gets pushed to remote. I think this happened on my android phone as well which cause me to uninstall that plugin as it messed with my remote repo. TIA
*suggestion for conflict resolution: a better format would
<<<<<File Change in local
insert the actual file changes
<<<<<File Change in remote
insert the actual file changes
reason is ==== and >>>> are already text modifiers/markdown syntaxes so it gets really confusing for first timers like me to understand how to resolve.
Beta Was this translation helpful? Give feedback.
All reactions