![]() ![]() conflict with the traditional manifestations of the Sublime experience, a. I edited this slightly to make it more readable, but basically you can see that the upstream has an added tag and my changes have an added tag - I want to keep both. merge with the father's or, for the poets of a naturalizing Romanticism, a. ![]() For example, the parts that say "ĭrag 'n' drop some files here, or click to select My guess is I have to manually change the file in Sublime Text (OR do a hard reset?) but I'm not sure how to approach it. I've looked up several similar questions on Stackoverflow, but couldn't find an exact solution. I feel this has an obvious answer but its not clear for me. This page is powered by a knowledgeable community that helps you make an informed decision. 'Supports editing files directly' is the primary reason people pick Meld over the competition. What I want to do is actually keep the upstream changes, AND keep my own changes. Meld, KDiff3, and Helix Visual Merge Tool (P4Merge) are probably your best bets out of the 16 options considered. Id prefer that sublime merge deletes the file when I choose -theirs But as an alternative, letting me know that 'they' deleted file and I probably want to do the same. Now when I try to "git stash pop" it says there is a conflict with one file, because it has changes from upstream plus my own changes. I then decided to fetch changes from the original repo - it told me I had to stash changes, which I did. I made some (uncommitted) changes on my local repo forked from another project. ![]()
0 Comments
Leave a Reply. |
AuthorWrite something about yourself. No need to be fancy, just an overview. ArchivesCategories |