Gitless
Thu Aug 29 2024 07:46:00 GMT+0000 (Coordinated Universal Time)
Saved by
@mikefried
$ gl fuse develop
...
✘ There are conflicts you need to resolve
$ gl status
On branch master, repo-directory //
You are in the middle of a fuse; all
conflicts must be resolved before
committing
...
Tracked files with modifications:
...
foo (with conflicts)
...
Switch to `bugfix`
$ gl switch bugfix
✔ Switched to branch bugfix
No conflicts here
Switch back to `develop`
$ gl switch develop
✔ Switched to branch develop
$ gl status
On branch master, repo-directory //
You are in the middle of a fuse; all
conflicts must be resolved before
committing
...
Tracked files with modifications:
...
foo (with conflicts)
...
content_copyCOPY
https://gitless.com/
Comments