SwiftFusion | The main code is in Sources/SwiftFusion
kandi X-RAY | SwiftFusion Summary
kandi X-RAY | SwiftFusion Summary
The main code is in Sources/SwiftFusion, organized under subdirectories.
Support
Quality
Security
License
Reuse
Top functions reviewed by kandi - BETA
Currently covering the most popular Java, JavaScript and Python libraries. See a Sample of SwiftFusion
SwiftFusion Key Features
SwiftFusion Examples and Code Snippets
Community Discussions
Trending Discussions on SwiftFusion
QUESTION
I'm trying to understand why this happens:
I have branched mybranch
from master
and made several commits that touch files A
, B
, and C
. Meanwhile someone else has pushed to master
a commit that deletes files X
and Y
along with some other changes. When I merge master
into mybranch
, git status
tells me X
is “unmerged” and Y
is “deleted.” Why are these files treated differently?
I believe that to be a reduction of what's happening to me in real life on http://github.com/borglab/SwiftFusion,
[Edit: I was mistaken about that, so the description above is inaccurate. @torek's answer below is excellent and instructive, though, so I'm not going to try to delete this question]
with master
at the tag conflict-merge-source
and mybranch
at the tag conflict-merge-target
, but I'm posting the actual repo in case I've missed something. The two files are Sources/SwiftFusion/Core/FixedShapeTensor.swift
(conflicted) and Tests/SwiftFusionTests/Core/FixedShapeTensorTests.swift (deleted).
ANSWER
Answered 2020-Oct-01 at 03:42There is a modify/delete conflict on one of the two files, and no conflict at all on the other, as you noted. The reason why one of the two files has no conflict is that one "side" of the merge did not touch the file at all, but the other side did.
For the file with the conflict, Git leaves the modified file in your work-tree and the conflict in Git's index, where you must resolve it. How to resolve it is up to you, but if the resolution is "keep the deletion" you can use git rm
on that name, and if it is to keep the modified file you can use git add
. Either way, Git's index—the proposed next commit—is now updated, and this particular conflict is resolved.
I cloned the repository in question and found the following:
Community Discussions, Code Snippets contain sources that include Stack Exchange Network
Vulnerabilities
No vulnerabilities reported
Install SwiftFusion
Support
Reuse Trending Solutions
Find, review, and download reusable Libraries, Code Snippets, Cloud APIs from over 650 million Knowledge Items
Find more librariesStay Updated
Subscribe to our newsletter for trending solutions and developer bootcamps
Share this Page