What is the best way to resolve merge conflicts in .swm files?
When trying to rebase my feature branch on the base branch (dev), I got merge conflicts on swm and generated md files:
The conflicts themselves are hard to understand on their own, and include many of file blob changes in the .swm file:
<<<<<<< HEAD
"fileBlob": "107f49a145f675f6b811b13b5a35b1dbfb018f83",
=======
"fileBlob": "ff2f2a6517bb9c5b86e6ff4d805f8b367a2c5dfc",
>>>>>>> 191d4efc6 (docs(swimm): update document Table API KnevxspVMVO1XfF6UxPS)
and this at the end:
How should I merge these conflicts? Which changes should I pick, and/or how can I test them?
I work for Swimm. These are rare, but unfortunately they do happen.
The best strategy that we've found is to accept the newest version, then verify it again. If it's just a case of code moving around, the auto sync algorithm might be able to take it from there. If not, you'll just need to edit the doc and possibly reselect some snippets.
In the very near future, we're releasing our swmd format, which moves all of the JSON and code waypoints and things completely behind the scenes, with the docs being saved in regular Markdown. So, if you encounter a conflict in the future, it'll be just like merging a regular README file.
If things don't resolve or you can't edit the document properly due to something, reach out to support and they'll get it corrected.
- Should I merge master into a feature branch to bring it up to date? Would this be considered bad practice?
- Switch node_modules folder when I change git branch
- git p4 submit fails
- Assign the latest release in GitHub (not using git)
- How to sign out github account in vs code
- Visual Studio Team Explorer - GIT: Automatically ignoring new files
- Get modified files in Github actions
- Command to open file with git
- git - gpg onto mac osx: error: gpg failed to sign the data
- Git credential helper - update password
- How to remove cached credentials from Git?
- If I fork someone else's private Github repo into my account, is it going to appear in my account as a public repo?
- Using local git username and email on remote machine
- How do I delete all Git branches which have been merged?
- Switch to another Git tag
- Merging changes from master into my branch
- Refname 'master' is ambiguous
- git fetch origin --prune doesn't delete local branches?
- Git: warning: refname 'master' is ambiguous
- git: don't sort 'for-each-ref' output
- GitKraken won't open
- git shows files changed with 0 insertions(+), 0 deletions(-)
- How do I access my SSH public key?
- Can't push to GitHub because of large file which I already deleted
- Overwrite the master branch with a orphan branch in git
- Why did Git throw "Failed to load library 'libcurl-4.dll'" while cloning?
- In merge request gitlab ci shows error that previous job needs another job but is not in any previous stage but it is
- Git get history of branches that i was in
- How do you remove an invalid remote branch reference from Git?
- Git archive including the actual repository?